On 07/20/2011 02:00 PM, Tomas Hrcka wrote:
---
src/app/util/condormatic.rb | 4 ++--
src/app/views/instances/_list.haml | 2 +-
src/app/views/pools/_form.haml | 2 +-
src/app/views/pools/_header_index.haml | 2 +-
src/app/views/pools/_header_show.haml | 2 +-
src/app/views/pools/_list.haml | 2 +-
src/features/pool.feature | 26 +++++++++++++-------------
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index b52ff46..1ae7de8 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -41,8 +41,8 @@ def write_pw_file(job_name, pw)
# here we write out the password file
# FIXME: should this be configurable?
pwdir = '/var/lib/aeolus-conductor/jobs'
- FileUtils.mkdir_p(pwdir, options={:mode => 0700})
- FileUtils.chown('aeolus', 'aeolus', pwdir)
+ #FileUtils.mkdir_p(pwdir, options={:mode => 0700})
+ #FileUtils.chown('aeolus', 'aeolus', pwdir)
We've talked about this offline: this should not be commented out and
got to the patch only accidentally.
I've reverted it back before pushing.
# Restrict job names to relatively sane characters only
job_name.gsub!(/[^a-zA-Z0-9\.\-]/, '_')
diff --git a/src/app/views/instances/_list.haml b/src/app/views/instances/_list.haml
index 8f27e36..1604ccf 100644
--- a/src/app/views/instances/_list.haml
+++ b/src/app/views/instances/_list.haml
@@ -4,7 +4,7 @@
- if @hide_stopped
%b Stopped
instances are hidden:
- = link_to "show all", params.merge('hide_stopped' =>
'false')
+ = link_to "show all", params.merge('hide_stopped' =>
'false'), :id => 'show_all_instances'
- else
Showing all instances:
= link_to "hide stopped", params.merge('hide_stopped' =>
'true')
diff --git a/src/app/views/pools/_form.haml b/src/app/views/pools/_form.haml
index ad79aaa..f411ee2 100644
--- a/src/app/views/pools/_form.haml
+++ b/src/app/views/pools/_form.haml
@@ -25,7 +25,7 @@
= form.check_box :enabled
%fieldset.options
- = form.submit "Save", :class => 'button'
+ = form.submit "Save", :class => 'button', :id =>
'save_button'
= link_to 'Cancel', pools_path, :class => 'button danger'
:javascript
diff --git a/src/app/views/pools/_header_index.haml
b/src/app/views/pools/_header_index.haml
index 4743f05..2068acf 100644
--- a/src/app/views/pools/_header_index.haml
+++ b/src/app/views/pools/_header_index.haml
@@ -3,7 +3,7 @@
#obj_actions.button-container
.button-group
= pretty_filter_toggle(pools_path(:view => 'pretty'),
pools_path(:view => 'filter'))
- = link_to "New Pool", new_pool_path, { :class => 'button
primary' }
+ = link_to "New Pool", new_pool_path, { :class => 'button
primary', :id => 'new_pool_button' }
.corner
= render :partial => 'scoreboard_index'
diff --git a/src/app/views/pools/_header_show.haml
b/src/app/views/pools/_header_show.haml
index 8eb3a04..1924fa9 100644
--- a/src/app/views/pools/_header_show.haml
+++ b/src/app/views/pools/_header_show.haml
@@ -5,5 +5,5 @@
= link_to 'New Deployment', launch_new_deployments_path(:pool_id =>
@pool.id), :class => 'button primary', :id =>
'new_deployment_button'
.button-group
= link_to 'Edit', edit_pool_path(@pool), :class => 'button
pill', :id => 'edit_pool_button'
- = button_to 'Delete', pool_path(@pool), :method => :delete, :confirm
=> t('pools.index.confirm_delete'), :class => "button pill
danger"
+ = button_to 'Delete', pool_path(@pool), :method => :delete, :confirm
=> t('pools.index.confirm_delete'), :class => "button pill
danger", :id => 'delete_pool_button'
.corner
diff --git a/src/app/views/pools/_list.haml b/src/app/views/pools/_list.haml
index 3cbc9e9..691296a 100644
--- a/src/app/views/pools/_list.haml
+++ b/src/app/views/pools/_list.haml
@@ -1,5 +1,5 @@
- form_header = capture_haml do
- = link_to "New Pool", new_pool_path, { :class => 'button' }
+ = link_to "New Pool", new_pool_path, { :class => 'button', :id
=> 'new_pool_button' }
= restful_submit_tag "Destroy", "destroy",
multi_destroy_pools_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
= label_tag "More actions"
= select_tag("more_actions",nil, :disabled => true)
diff --git a/src/features/pool.feature b/src/features/pool.feature
index 9be0c38..f0393fd 100644
--- a/src/features/pool.feature
+++ b/src/features/pool.feature
@@ -10,13 +10,13 @@ Feature: Manage Pools
Scenario: Create a new Pool
Given I am on the pools page
And there is not a pool named "mockpool"
- When I follow "New Pool"
+ When I follow "new_pool_button"
Then I should be on the new pool page
And I should see "Create New Pool"
When I fill in "pool_name" with "mockpool"
And I select "default" from "pool_pool_family_id"
And I fill in "quota_instances" with "unlimited"
- And I press "Save"
+ And I press "save_button"
Then I should be on the pool page
And I should see "mockpool Pool"
And I should have a pool named "mockpool"
@@ -29,7 +29,7 @@ Feature: Manage Pools
When I fill in "pool_name" with "mockpool"
And I select "default" from "pool_pool_family_id"
And I fill in "quota_instances" with "unlimited"
- And I press "Save"
+ And I press "save_button"
Then I should get back a partial
And I should see "mockpool"
@@ -46,7 +46,7 @@ Feature: Manage Pools
Scenario: Enter invalid characters into Name field
Given I am on the new pool page
When I fill in "pool[name]" with "@%&*())_@!#!"
- And I press "Save"
+ And I press "save_button"
Then I should see "Name must only contain: numbers, letters, spaces,
'_' and '-'"
Scenario: Delete pools
@@ -58,7 +58,7 @@ Feature: Manage Pools
Then there should be 3 pools
When I check "Redhat Voyager Pool" pool
And I check "Amazon Startrek Pool" pool
- And I press "Destroy"
+ And I press "delete_button"
Then there should only be 1 pools
And I should be on the pools page
When I go to the pools page
@@ -70,24 +70,24 @@ Feature: Manage Pools
And there is not a pool named "mockpool"
And there is not a pool named "foopool"
When I follow link with ID "filter_view"
- And I follow "New Pool"
+ And I follow "new_pool_button"
Then I should be on the new pool page
And I should see "Create New Pool"
When I fill in "pool_name" with "mockpool"
And I select "default" from "pool_pool_family_id"
- And I press "Save"
+ And I press "save_button"
Then I should be on the pool page
And I should see "Pool added"
And I should see "mockpool"
And I should have a pool named "mockpool"
When I go to the pools page
And I follow link with ID "filter_view"
- And I follow "New Pool"
+ And I follow "new_pool_button"
Then I should be on the new pool page
And I should see "Create New Pool"
When I fill in "pool_name" with "foopool"
And I select "default" from "pool_pool_family_id"
- And I press "Save"
+ And I press "save_button"
Then I should be on the pool page
And I should see "Pool added"
And I should have a pool named "mockpool"
@@ -97,7 +97,7 @@ Feature: Manage Pools
Given I am on the pools page
When I follow link with ID "filter_view"
And I check "Default" pool
- And I press "Destroy"
+ And I press "delete_button"
Then I should see "The default pool cannot be deleted"
And I should see "Default"
@@ -106,7 +106,7 @@ Feature: Manage Pools
And I am on the pools page
When I follow link with ID "filter_view"
And I check "pool_default" pool
- And I press "Destroy"
+ And I press "delete_button"
Then I should see "The default pool cannot be deleted"
And I should see "pool_default"
@@ -193,11 +193,11 @@ Feature: Manage Pools
And there is a "mock2" running instance
And there is a "mock3" stopped instance
When I follow link with ID "filter_view"
- And I follow "Instances"
+ And I follow "details_instances"
And I should see "mock1"
And I should see "mock2"
And I should not see "mock3"
- When I follow "show all"
+ When I follow "show_all_instances"
And I should see "mock1"
And I should see "mock2"
And I should see "mock3"
ACK & pushed after a small change (inline).
Thomas
--
No trees were killed to send this message, but a large number of
electrons were terribly inconvenienced.