From: Jan Provaznik <jprovazn(a)redhat.com>
This partially fixes
https://www.aeolusproject.org/redmine/issues/2412
But not all of them.
---
src/app/controllers/providers_controller.rb | 2 +-
.../provider_accounts_controller_spec.rb | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/app/controllers/providers_controller.rb
b/src/app/controllers/providers_controller.rb
index 818c423..516b65b 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -172,6 +172,6 @@ class ProvidersController < ApplicationController
protected
def load_providers
- @providers = Provider.list_for_user(current_user, Privilege::VIEW, :order =>
:name)
+ @providers = Provider.list_for_user(current_user, Privilege::VIEW)
end
end
diff --git a/src/spec/controllers/provider_accounts_controller_spec.rb
b/src/spec/controllers/provider_accounts_controller_spec.rb
index b4d9962..4406a83 100644
--- a/src/spec/controllers/provider_accounts_controller_spec.rb
+++ b/src/spec/controllers/provider_accounts_controller_spec.rb
@@ -32,11 +32,10 @@ describe ProviderAccountsController do
@admin = @admin_permission.user
end
- it "shows provider accounts as list" do
+ it "shows provider accounts as XML list" do
mock_warden(@admin)
- get :index, :provider_id => @provider.id
+ get :index, :format => :xml
response.should be_success
- response.should render_template("index")
end
it "doesn't allow to save provider's account if not valid
credentials" do
@@ -49,7 +48,7 @@ describe ProviderAccountsController do
it "should permit users with account modify permission to access edit cloud
account interface" do
mock_warden(@admin)
- get :edit, :id => @provider_account.id
+ get :edit, :provider_id => @provider, :id => @provider_account.id
response.should be_success
response.should render_template("edit")
end
--
1.7.6