[PATCH conductor 1/2] Adds tests for streamlined XML in API output
pblaho at redhat.com
pblaho at redhat.com
Wed Sep 5 02:57:01 UTC 2012
From: Petr Blaho <pblaho at redhat.com>
for Provider and Provider Account index actions
https://www.aeolusproject.org/redmine/issues/3759
---
src/spec/controllers/providers_controller_spec.rb | 6 +++++-
.../shared_examples_for_provider_accounts_api.rb | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/spec/controllers/providers_controller_spec.rb b/src/spec/controllers/providers_controller_spec.rb
index 42c6560..c139601 100644
--- a/src/spec/controllers/providers_controller_spec.rb
+++ b/src/spec/controllers/providers_controller_spec.rb
@@ -32,8 +32,12 @@ describe ProvidersController do
it "should have correct providers" do
providers.each do |provider|
xml_provider = xml_providers.xpath("//provider[@id=\"#{provider.id}\"]")
- xml_provider.xpath('name').text.should be_eql(provider.name.to_s)
xml_provider.xpath('@href').text.should be_eql(api_provider_url(provider))
+ # xml_provider.xpath('name').text.should be_eql(provider.name.to_s)
+ # it should not have details of providers
+ %w{name url provider_type deltacloud_provider}.each do |element|
+ xml_provider.xpath(element).should be_empty
+ end
end
end
end
diff --git a/src/spec/support/shared_examples_for_provider_accounts_api.rb b/src/spec/support/shared_examples_for_provider_accounts_api.rb
index 3443e16..b3d3157 100644
--- a/src/spec/support/shared_examples_for_provider_accounts_api.rb
+++ b/src/spec/support/shared_examples_for_provider_accounts_api.rb
@@ -10,8 +10,12 @@ shared_examples_for "having XML with provider accounts" do
it "should have correct provider accounts" do
provider_accounts.each do |provider_account|
xml_provider_account = xml_provider_accounts.xpath("//provider_account[@id=\"#{provider_account.id}\"]")
- xml_provider_account.xpath('label').text.should be_eql(provider_account.name.to_s)
xml_provider_account.xpath('@href').text.should be_eql(api_provider_account_url(provider_account))
+ # xml_provider_account.xpath('label').text.should be_eql(provider_account.name.to_s)
+ # it should not have provider accounts details
+ %w{label provider provider_type quota_used quota priority credentials}.each do |element|
+ xml_provider_account.xpath(element).should be_empty
+ end
end
end
it "should have not incorrect provider accounts" do
--
1.7.7.6
More information about the aeolus-devel
mailing list