From: Greg Blomquist <gblomqui(a)redhat.com>
* new provider account path
* removed auth_logic
* removed condor
Also, fixed typo in provider account cucumber paths.
---
src/app/controllers/config_servers_controller.rb | 12 ++++++---
.../views/config_servers/_config_server_form.haml | 5 ++-
src/app/views/config_servers/edit.haml | 2 +-
src/app/views/config_servers/new.haml | 2 +-
src/app/views/provider_accounts/_properties.haml | 12 +++++-----
src/features/config_server.feature | 24 ++++++++++----------
.../step_definitions/config_server_steps.rb | 2 +-
src/features/support/paths.rb | 2 +-
.../controllers/config_servers_controller_spec.rb | 23 +++++++++++++++----
src/spec/models/instance_spec.rb | 10 ++++----
10 files changed, 56 insertions(+), 38 deletions(-)
diff --git a/src/app/controllers/config_servers_controller.rb
b/src/app/controllers/config_servers_controller.rb
index dd53be1..03fc28f 100644
--- a/src/app/controllers/config_servers_controller.rb
+++ b/src/app/controllers/config_servers_controller.rb
@@ -27,7 +27,9 @@ class ConfigServersController < ApplicationController
else
flash[:notice] = "Test successful"
end
- redirect_to provider_account_path(config_server.provider_account.id)
+ provider_account = config_server.provider_account
+ provider = provider_account.provider
+ redirect_to provider_provider_account_path(provider, provider_account)
end
def create
@@ -44,7 +46,7 @@ class ConfigServersController < ApplicationController
end
@config_server.save!
flash[:notice] = "Config server added."
- redirect_to provider_account_path(@provider_account)
+ redirect_to provider_provider_account_path((a)provider_account.provider,
@provider_account)
end
def update
@@ -54,7 +56,7 @@ class ConfigServersController < ApplicationController
if @config_server.update_attributes(params[:config_server])
flash[:notice] = "Config server updated."
- redirect_to provider_account_path(@provider_account)
+ redirect_to provider_provider_account_path((a)provider_account.provider,
@provider_account)
else
flash[:error] = "Config server was not updated"
render :action => :edit
@@ -69,6 +71,8 @@ class ConfigServersController < ApplicationController
else
flash[:error] = "Config server was not deleted"
end
- redirect_to provider_account_path((a)config_server.provider_account)
+ provider_account = @config_server.provider_account
+ provider = provider_account.provider
+ redirect_to provider_provider_account_path(provider, provider_account)
end
end
diff --git a/src/app/views/config_servers/_config_server_form.haml
b/src/app/views/config_servers/_config_server_form.haml
index 53d5c35..4896778 100644
--- a/src/app/views/config_servers/_config_server_form.haml
+++ b/src/app/views/config_servers/_config_server_form.haml
@@ -1,4 +1,5 @@
-= error_messages_for @config_server
+- if @config_server.errors.any?
+ = render 'layouts/error_messages', :object => @config_server
%fieldset
%p
= hidden_field_tag "provider_account_id", @provider_account.id
@@ -20,5 +21,5 @@
= form.text_area :certificate, :rows => 20, :cols => 64
%fieldset.options
- = link_to t(:cancel), provider_account_path(@provider_account), :class =>
"button danger"
+ = link_to t(:cancel), provider_provider_account_path((a)provider_account.provider,
@provider_account), :class => "button danger"
= submit_tag t(:save), :name => "save", :class => "button",
:id => "save_button"
diff --git a/src/app/views/config_servers/edit.haml
b/src/app/views/config_servers/edit.haml
index e486db0..07b3abe 100644
--- a/src/app/views/config_servers/edit.haml
+++ b/src/app/views/config_servers/edit.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.config_server
diff --git a/src/app/views/config_servers/new.haml
b/src/app/views/config_servers/new.haml
index 8ede90c..9ea48b2 100644
--- a/src/app/views/config_servers/new.haml
+++ b/src/app/views/config_servers/new.haml
@@ -1,4 +1,4 @@
-= render :partial => 'layouts/admin_header'
+= render :partial => 'layouts/admin_nav'
= render :partial => 'section_header'
%section.content-section.config_server
diff --git a/src/app/views/provider_accounts/_properties.haml
b/src/app/views/provider_accounts/_properties.haml
index f8b60f1..cda06e9 100644
--- a/src/app/views/provider_accounts/_properties.haml
+++ b/src/app/views/provider_accounts/_properties.haml
@@ -21,21 +21,21 @@
%td
%label Config Server:
%td
- - missing_config_server = @account.config_server.nil?
+ - missing_config_server = @provider_account.config_server.nil?
%span#config_server
- = missing_config_server ? "None" : @account.config_server.base_url
+ = missing_config_server ? "None" :
@provider_account.config_server.base_url
%span#config_server_control
- if missing_config_server
[
- = link_to 'Add', new_config_server_url +
"?provider_account_id=#{(a)account.id}"
+ = link_to 'Add', new_config_server_url +
"?provider_account_id=#{(a)provider_account.id}"
]
- else
[
- = link_to 'Edit', edit_config_server_path((a)account.config_server)
+ = link_to 'Edit',
edit_config_server_path((a)provider_account.config_server)
]
[
- = link_to 'Test', test_config_server_path((a)account.config_server)
+ = link_to 'Test',
test_config_server_path((a)provider_account.config_server)
]
[
- = link_to 'Delete', config_server_path((a)account.config_server),
:method => 'delete', :confirm => "Are you sure you want to delete this
config server?"
+ = link_to 'Delete',
config_server_path((a)provider_account.config_server), :method => 'delete',
:confirm => "Are you sure you want to delete this config server?"
]
diff --git a/src/features/config_server.feature b/src/features/config_server.feature
index 9beecf8..325c6b2 100644
--- a/src/features/config_server.feature
+++ b/src/features/config_server.feature
@@ -13,7 +13,7 @@ Feature: Config Servers
Given I am on the homepage
And there is mock provider account "mock_account"
And I want to add a new config server
- When I go to mock_account's provider account page
+ When I go to mockprovider's provider mock_account's provider account page
Then I should see "None" within "#config_server"
And I should see "[ Add ]" within "#config_server_control"
When I follow "Add"
@@ -21,7 +21,7 @@ Feature: Config Servers
When I fill in "config_server[host]" with "valid_host"
When I fill in "config_server[port]" with "valid_port"
And I press "Save"
- Then I should be on mock_account's provider account page
+ Then I should be on mockprovider's provider mock_account's provider account
page
And I should see "Config server added"
And I should see "[ Edit ]" within "#config_server_control"
@@ -31,7 +31,7 @@ Feature: Config Servers
Given I am on the homepage
And there is mock provider account "mock_account"
And I am not sure about the config server host
- When I go to mock_account's provider account page
+ When I go to mockprovider's provider mock_account's provider account page
Then I should see "None" within "#config_server"
And I should see "[ Add ]" within "#config_server_control"
When I follow "Add"
@@ -48,7 +48,7 @@ Feature: Config Servers
Given I am on the homepage
And there is mock provider account "mock_account"
And I am not sure about the config server credentials
- When I go to mock_account's provider account page
+ When I go to mockprovider's provider mock_account's provider account page
Then I should see "None" within "#config_server"
And I should see "[ Add ]" within "#config_server_control"
When I follow "Add"
@@ -64,36 +64,36 @@ Feature: Config Servers
Scenario: I should be able to edit a config server
Given I am on the homepage
And there is a mock config server "https://mock:443" for account
"mock_account"
- When I go to mock_account's provider account page
+ When I go to mockprovider's provider mock_account's provider account page
Then I should see "[ Edit ]" within "#config_server_control"
When I follow "Edit" within "#config_server_control"
Then I should be on the edit config server page for account "mock_account"
And I press "Save"
- Then I should be on mock_account's provider account page
+ Then I should be on mockprovider's provider mock_account's provider account
page
And I should see "Config server updated"
Scenario: I should be able to delete an existing config server
Given I am on the homepage
And there is a mock config server "https://mock:443" for account
"mock_account"
- When I go to mock_account's provider account page
+ When I go to mockprovider's provider mock_account's provider account page
Then I should see "[ Delete ]" within "#config_server_control"
When I follow "Delete" within "#config_server_control"
Then I should see "Config server was deleted"
- And I should be on mock_account's provider account page
+ And I should be on mockprovider's provider mock_account's provider account
page
Scenario: I should be able to test a correctly configured and available config server
Given I am on the homepage
And there is a mock config server "https://mock:443" for account
"mock_account"
- When I go to mock_account's provider account page
+ When I go to mockprovider's provider mock_account's provider account page
Then I should see "[ Test ]" within "#config_server_control"
When I follow "Test" within "#config_server_control"
Then I should see "Test successful"
- And I should be on mock_account's provider account page
+ And I should be on mockprovider's provider mock_account's provider account
page
Scenario: I should see an error when I test a config server with invalid credentials
Given I am on the homepage
And there is a mock config server "https://bad_credentials:443" for account
"mock_account"
- When I go to mock_account's provider account page
+ When I go to mockprovider's provider mock_account's provider account page
Then I should see "[ Test ]" within "#config_server_control"
When I follow "Test" within "#config_server_control"
Then I should see "Could not validate config server connection"
@@ -102,7 +102,7 @@ Feature: Config Servers
Scenario: I should see an error when I test a config server with an invalid host
Given I am on the homepage
And there is a mock config server "https://bad_host:443" for account
"mock_account"
- When I go to mock_account's provider account page
+ When I go to mockprovider's provider mock_account's provider account page
Then I should see "[ Test ]" within "#config_server_control"
When I follow "Test" within "#config_server_control"
Then I should see "Could not validate config server connection"
diff --git a/src/features/step_definitions/config_server_steps.rb
b/src/features/step_definitions/config_server_steps.rb
index 438ad00..c220312 100644
--- a/src/features/step_definitions/config_server_steps.rb
+++ b/src/features/step_definitions/config_server_steps.rb
@@ -14,7 +14,7 @@ Given /^I am not sure about the config server credentials$/ do
end
Given /^there is a mock config server "(http|https):\/\/(.*):(.*)" for account
"(.*)"$/ do |scheme,host,port,acc|
- provider = Factory :mock_provider, :name => "mock_provider"
+ provider = Factory :mock_provider, :name => "mockprovider"
mock_account = Factory :mock_provider_account, :label => acc, :provider =>
provider
params = {:host => host, :port => port, :provider_account => mock_account}
if "https" == scheme
diff --git a/src/features/support/paths.rb b/src/features/support/paths.rb
index b0358f5..57928c6 100644
--- a/src/features/support/paths.rb
+++ b/src/features/support/paths.rb
@@ -104,7 +104,7 @@ module NavigationHelpers
when /^(.*)'s edit hardware profile page$/
edit_hardware_profile_path(HardwareProfile.find_by_name($1))
- when /^(.*)'s provider ^(.*)'s provider account page$/
+ when /^(.*)'s provider (.*)'s provider account page$/
provider_provider_account_path(Provider.find_by_name($1),
ProviderAccount.find_by_label($2))
when /^(.*)'s new provider account page$/
diff --git a/src/spec/controllers/config_servers_controller_spec.rb
b/src/spec/controllers/config_servers_controller_spec.rb
index 8b02cd5..e1247e7 100644
--- a/src/spec/controllers/config_servers_controller_spec.rb
+++ b/src/spec/controllers/config_servers_controller_spec.rb
@@ -4,25 +4,28 @@ describe ConfigServersController do
fixtures :all
before(:each) do
- @admin_permission = Factory :admin_permission
- @admin = @admin_permission.user
- activate_authlogic
- @session = UserSession.create(@admin)
+ @tuser = FactoryGirl.create :tuser
end
context "editing config servers" do
before(:each) do
@config_server = Factory :mock_config_server
@provider_account = @config_server.provider_account
+ @admin_permission = Permission.create :role => Role.find(:first, :conditions
=> ['name = ?', 'Provider Administrator']),
+ :permission_object =>
@provider_account.provider,
+ :user =>
FactoryGirl.create(:provider_admin_user)
+ @admin = @admin_permission.user
end
it "should provide UI to edit an existing Config Server" do
+ mock_warden(@admin)
get :edit, :id => @config_server.id
response.should be_success
response.should render_template("edit")
end
it "should allow users with account modify permissions to update a Config
Server" do
+ mock_warden(@admin)
post :update, :id => @config_server.id, :config_server => {:host =>
"host", :port => "port"}
response.should be_success
end
@@ -31,15 +34,21 @@ describe ConfigServersController do
context "creating config servers" do
before(:each) do
@provider_account = Factory :mock_provider_account
+ @admin_permission = Permission.create :role => Role.find(:first, :conditions
=> ['name = ?', 'Provider Administrator']),
+ :permission_object =>
@provider_account.provider,
+ :user =>
FactoryGirl.create(:provider_admin_user)
+ @admin = @admin_permission.user
end
it "should provide UI to create a new Config Server" do
+ mock_warden(@admin)
get :new, :provider_account_id => @provider_account.id
response.should be_success
response.should render_template("new")
end
it "should allow users with account modify permissions to create a Config
Server" do
+ mock_warden(@admin)
config_server = Factory :mock_config_server, :host => "host", :port
=> "port"
ConfigServer.stub!(:new).and_return(config_server)
post :create, :provider_account_id => @provider_account.id,
@@ -47,11 +56,12 @@ describe ConfigServersController do
:host => "host",
:port => "port"
}
- response.should redirect_to(provider_account_path((a)provider_account.id))
+ response.should
redirect_to(provider_provider_account_path((a)provider_account.provider,
@provider_account))
request.flash[:error].should be_nil
end
it "should fail creating a config server when the username or password is
invalid" do
+ mock_warden(@admin)
config_server = Factory :invalid_credentials_config_server, :host =>
"host", :port => "port", :username => "invalid",
:password => "invalid"
ConfigServer.stub!(:new).and_return(config_server)
post :create, :provider_account_id => @provider_account.id,
@@ -67,6 +77,7 @@ describe ConfigServersController do
end
it "should fail creating a config server when the host and port are
invalid" do
+ mock_warden(@admin)
config_server = Factory :invalid_host_or_port_config_server, :host =>
"invalid", :port => "invalid"
ConfigServer.stub!(:new).and_return(config_server)
post :create, :provider_account_id => @provider_account.id,
@@ -80,6 +91,7 @@ describe ConfigServersController do
end
it "should require that port is provided" do
+ mock_warden(@admin)
post :create, :provider_account_id => @provider_account.id,
:config_server => {
:host => "host",
@@ -91,6 +103,7 @@ describe ConfigServersController do
end
it "should require that host is provided" do
+ mock_warden(@admin)
post :create, :provider_account_id => @provider_account.id,
:config_server => {
:host => "",
diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb
index fdc073c..4ffdae0 100644
--- a/src/spec/models/instance_spec.rb
+++ b/src/spec/models/instance_spec.rb
@@ -274,7 +274,7 @@ describe Instance do
matches, errors = @instance.matches
matches.should_not be_empty
- matches.first.account.should eql(account)
+ matches.first.provider_account.should eql(account)
end
it "should not match if the account does not have a config server and the instance
has configs" do
@@ -293,11 +293,11 @@ describe Instance do
it "should match only the intersecting provider accounts for all instances"
do
account1 = FactoryGirl.create(:mock_provider_account, :label =>
"test_account1")
- possible1 = Possible.new(nil,account1,nil,nil,nil)
+ possible1 = Instance::Match.new(nil,account1,nil,nil,nil)
account2 = FactoryGirl.create(:mock_provider_account, :label =>
"test_account2")
- possible2 = Possible.new(nil,account2,nil,nil,nil)
+ possible2 = Instance::Match.new(nil,account2,nil,nil,nil)
account3 = FactoryGirl.create(:mock_provider_account, :label =>
"test_account3")
- possible3 = Possible.new(nil,account3,nil,nil,nil)
+ possible3 = Instance::Match.new(nil,account3,nil,nil,nil)
# not gonna test the individual instance "machtes" logic again
# just stub out the behavior
@@ -311,6 +311,6 @@ describe Instance do
instances = [instance1, instance2, instance3]
matches, errors = Instance.matches(instances)
matches.should_not be_empty
- matches.first.account.should eql(account2)
+ matches.first.provider_account.should eql(account2)
end
end
--
1.7.4.4