[PATCH conductor 3/7] Renames "name" to "label" in Provider Account XML
pblaho at redhat.com
pblaho at redhat.com
Wed Aug 15 17:11:26 UTC 2012
From: Petr Blaho <pblaho at redhat.com>
This renames <name> to <label> in template for XML of Provider Account
and specs for this.
---
src/app/views/provider_accounts/_detail.xml.haml | 2 +-
.../shared_examples_for_provider_accounts_api.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/views/provider_accounts/_detail.xml.haml b/src/app/views/provider_accounts/_detail.xml.haml
index beb7a8c..67b7df0 100644
--- a/src/app/views/provider_accounts/_detail.xml.haml
+++ b/src/app/views/provider_accounts/_detail.xml.haml
@@ -1,7 +1,7 @@
%provider_account{:id => provider_account.id, :href => api_provider_account_url(provider_account)}
-provider = provider_account.provider
-provider_type = provider.provider_type
- %name= provider_account.name
+ %label= provider_account.name
%provider{:id => provider.id, :href => api_provider_url(provider)}= provider.name
%provider_type= provider_type.deltacloud_driver
-if local_assigns[:with_credentials]
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 bf436ee..3d37616 100644
--- a/src/spec/support/shared_examples_for_provider_accounts_api.rb
+++ b/src/spec/support/shared_examples_for_provider_accounts_api.rb
@@ -10,7 +10,7 @@ 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('name').text.should be_eql(provider_account.name.to_s)
+ 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))
end
end
--
1.7.7.6
More information about the aeolus-devel
mailing list