This patchset modifies deployment and suggested deployale features to use element reconition by id
From: Jiri Tomasek jtomasek@redhat.com
--- src/app/views/deployments/_edit.haml | 2 +- src/app/views/deployments/_header_show.haml | 2 +- src/app/views/deployments/_launch_new.haml | 2 +- src/features/deployment.feature | 36 +++++++++++++------------- 4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/app/views/deployments/_edit.haml b/src/app/views/deployments/_edit.haml index 21190b0..66b236e 100644 --- a/src/app/views/deployments/_edit.haml +++ b/src/app/views/deployments/_edit.haml @@ -7,4 +7,4 @@ = text_field :deployment, :name
= submit_tag 'Cancel', :name => 'cancel' - = submit_tag 'Save', :name => 'save' + = submit_tag 'Save', :name => 'save', :id => 'save_button' diff --git a/src/app/views/deployments/_header_show.haml b/src/app/views/deployments/_header_show.haml index ff0fa52..8d03753 100644 --- a/src/app/views/deployments/_header_show.haml +++ b/src/app/views/deployments/_header_show.haml @@ -3,5 +3,5 @@ = [@deployment.name, "Deployment"].join(' ') #obj_actions.button-container .button-group - = button_to 'Delete', deployment_path(@deployment), :method => :delete, :confirm => t("deployments.confirm_delete"), :class => "button pill danger" + = button_to 'Delete', deployment_path(@deployment), :method => :delete, :confirm => t("deployments.confirm_delete"), :class => "button pill danger", :id => 'delete_button' .corner diff --git a/src/app/views/deployments/_launch_new.haml b/src/app/views/deployments/_launch_new.haml index 3e24758..c739286 100644 --- a/src/app/views/deployments/_launch_new.haml +++ b/src/app/views/deployments/_launch_new.haml @@ -40,7 +40,7 @@ = select :deployment, :frontend_realm_id, @realms.map{|r| [r.name, r.id]}, :include_blank => true
%fieldset.options - = submit_tag 'Next', :class => 'button' + = submit_tag 'Next', :class => 'button', :id => "next_button"
:javascript diff --git a/src/features/deployment.feature b/src/features/deployment.feature index eda5123..31a536a 100644 --- a/src/features/deployment.feature +++ b/src/features/deployment.feature @@ -11,7 +11,7 @@ Feature: Manage Deployments Given there is a deployment named "MySQL Cluster" belonging to "Databases" owned by "bob" And I am on the pools page When I follow link with ID "filter_view" - And I follow "Deployments" within "#tab-container-1-nav" + And I follow "details_deployments" within "#tab-container-1-nav" Then I should see "MySQL Cluster" And I should see "bob"
@@ -20,7 +20,7 @@ Feature: Manage Deployments And I am on the pools page And I request XHR When I follow link with ID "filter_view" - And I follow "Deployments" + And I follow "details_deployments" Then I should see "MySQL Cluster" And I should see "bob"
@@ -29,13 +29,13 @@ Feature: Manage Deployments And there is "front_hwp1" conductor hardware profile And there is "front_hwp2" conductor hardware profile When I am viewing the pool "mockpool" - And I follow "New Deployment" + And I follow "new_deployment_button" Then I should see "New Deployment" When I fill in "deployable_url" with "http://localhost/deployables/deployable1.xml" When I fill in "deployment_name" with "mynewdeployment" - When I press "Next" + When I press "next_button" Then I should see "Deployable details" - When I press "Launch" + When I press "launch_deployment" Then I should see "Deployment launched" Then I should see "mynewdeployment Deployment" And I should see "mynewdeployment/frontend" @@ -47,14 +47,14 @@ Feature: Manage Deployments And there is "front_hwp2" conductor hardware profile When I am viewing the pool "mockpool" And I request XHR - And I follow "New Deployment" + And I follow "new_deployment_button" Then I should get back a partial Then I should see "New Deployment" When I fill in "deployable_url" with "http://localhost/deployables/deployable1.xml" When I fill in "deployment_name" with "mynewdeployment" - When I press "Next" + When I press "next_button" Then I should see "Deployable details" - When I press "Launch" + When I press "launch_deployment" Then I should see "Created" Then I should see "mynewdeployment"
@@ -63,7 +63,7 @@ Feature: Manage Deployments And there is "front_hwp1" conductor hardware profile And there is "front_hwp2" conductor hardware profile When I am viewing the pool "Disabled" - And I follow "New Deployment" + And I follow "new_deployment_button" Then I should see "pool has been disabled" And I should be on the page for the pool "Disabled"
@@ -72,7 +72,7 @@ Feature: Manage Deployments When I go to the deployments page Then I should see "testdeployment" When I check "testdeployment" deployment - And I press "Stop" + And I press "stop_button" Then I should see "testdeployment"
Scenario: Stop a deployment over XHR @@ -82,7 +82,7 @@ Feature: Manage Deployments Then I should get back a partial And I should see "testdeployment" When I check "testdeployment" deployment - And I press "Stop" + And I press "stop_button" Then I should get back a partial And I should see "testdeployment"
@@ -96,8 +96,8 @@ Feature: Manage Deployments Given there is a deployment named "Hudson" belonging to "QA Infrastructure" owned by "joe" When I go to Hudson's edit deployment page Then I should see "Edit deployment" - When I fill in "name" with "Jenkins" - And I press "Save" + When I fill in "deployment_name" with "Jenkins" + And I press "save_button" Then I should be on Jenkins's deployment page And I should see "Jenkins"
@@ -108,7 +108,7 @@ Feature: Manage Deployments Then I should get back a partial And I should see "Edit deployment" When I fill in "name" with "Jenkins" - And I press "Save" + And I press "save_button" Then I should get back a partial And I should be on Jenkins's deployment page And I should see "Jenkins" @@ -152,11 +152,11 @@ Feature: Manage Deployments Scenario: Provider invalid deployable xml URL when launching a deployment Given a pool "mockpool" exists When I am viewing the pool "mockpool" - And I follow "New Deployment" + And I follow "new_deployment_button" Then I should see "New Deployment" When I fill in "deployable_url" with "http://invalid.deployable.url/" And I fill in "deployment_name" with "mynewdeployment" - And I press "Next" + And I press "next_button" Then I should see "New Deployment" And I should see "Deployment Details" And I should see "failed to get the deployable definition" @@ -173,12 +173,12 @@ Feature: Manage Deployments | Owner | John testuser | | Name | testdeployment |
- When I follow "Instances" + When I follow "details_instances" Then I should see "testdeployment"
Scenario: Delete a deployment Given there is a deployment named "testdeployment" belonging to "testdeployable" owned by "testuser" And I am on the pools page When I follow "testdeployment" - And I press "Delete" + And I press "delete_button" Then I should see "The deployment testdeployment was successfully deleted"
On 07/18/2011 04:02 PM, jtomasek@redhat.com wrote:
From: Jiri Tomasekjtomasek@redhat.com
src/app/views/deployments/_edit.haml | 2 +- src/app/views/deployments/_header_show.haml | 2 +- src/app/views/deployments/_launch_new.haml | 2 +- src/features/deployment.feature | 36 +++++++++++++------------- 4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/app/views/deployments/_edit.haml b/src/app/views/deployments/_edit.haml index 21190b0..66b236e 100644 --- a/src/app/views/deployments/_edit.haml +++ b/src/app/views/deployments/_edit.haml @@ -7,4 +7,4 @@ = text_field :deployment, :name
= submit_tag 'Cancel', :name => 'cancel'
- = submit_tag 'Save', :name => 'save'
- = submit_tag 'Save', :name => 'save', :id => 'save_button'
diff --git a/src/app/views/deployments/_header_show.haml b/src/app/views/deployments/_header_show.haml index ff0fa52..8d03753 100644 --- a/src/app/views/deployments/_header_show.haml +++ b/src/app/views/deployments/_header_show.haml @@ -3,5 +3,5 @@ = [@deployment.name, "Deployment"].join(' ') #obj_actions.button-container .button-group
= button_to 'Delete', deployment_path(@deployment), :method => :delete, :confirm => t("deployments.confirm_delete"), :class => "button pill danger"
.corner = button_to 'Delete', deployment_path(@deployment), :method => :delete, :confirm => t("deployments.confirm_delete"), :class => "button pill danger", :id => 'delete_button'
diff --git a/src/app/views/deployments/_launch_new.haml b/src/app/views/deployments/_launch_new.haml index 3e24758..c739286 100644 --- a/src/app/views/deployments/_launch_new.haml +++ b/src/app/views/deployments/_launch_new.haml @@ -40,7 +40,7 @@ = select :deployment, :frontend_realm_id, @realms.map{|r| [r.name, r.id]}, :include_blank => true
%fieldset.options
= submit_tag 'Next', :class => 'button'
= submit_tag 'Next', :class => 'button', :id => "next_button"
:javascript
diff --git a/src/features/deployment.feature b/src/features/deployment.feature index eda5123..31a536a 100644 --- a/src/features/deployment.feature +++ b/src/features/deployment.feature @@ -11,7 +11,7 @@ Feature: Manage Deployments Given there is a deployment named "MySQL Cluster" belonging to "Databases" owned by "bob" And I am on the pools page When I follow link with ID "filter_view"
- And I follow "Deployments" within "#tab-container-1-nav"
- And I follow "details_deployments" within "#tab-container-1-nav" Then I should see "MySQL Cluster" And I should see "bob"
@@ -20,7 +20,7 @@ Feature: Manage Deployments And I am on the pools page And I request XHR When I follow link with ID "filter_view"
- And I follow "Deployments"
- And I follow "details_deployments" Then I should see "MySQL Cluster" And I should see "bob"
@@ -29,13 +29,13 @@ Feature: Manage Deployments And there is "front_hwp1" conductor hardware profile And there is "front_hwp2" conductor hardware profile When I am viewing the pool "mockpool"
- And I follow "New Deployment"
- And I follow "new_deployment_button" Then I should see "New Deployment" When I fill in "deployable_url" with "http://localhost/deployables/deployable1.xml" When I fill in "deployment_name" with "mynewdeployment"
- When I press "Next"
- When I press "next_button" Then I should see "Deployable details"
- When I press "Launch"
- When I press "launch_deployment" Then I should see "Deployment launched" Then I should see "mynewdeployment Deployment" And I should see "mynewdeployment/frontend"
@@ -47,14 +47,14 @@ Feature: Manage Deployments And there is "front_hwp2" conductor hardware profile When I am viewing the pool "mockpool" And I request XHR
- And I follow "New Deployment"
- And I follow "new_deployment_button" Then I should get back a partial Then I should see "New Deployment" When I fill in "deployable_url" with "http://localhost/deployables/deployable1.xml" When I fill in "deployment_name" with "mynewdeployment"
- When I press "Next"
- When I press "next_button" Then I should see "Deployable details"
- When I press "Launch"
- When I press "launch_deployment" Then I should see "Created" Then I should see "mynewdeployment"
@@ -63,7 +63,7 @@ Feature: Manage Deployments And there is "front_hwp1" conductor hardware profile And there is "front_hwp2" conductor hardware profile When I am viewing the pool "Disabled"
- And I follow "New Deployment"
- And I follow "new_deployment_button" Then I should see "pool has been disabled" And I should be on the page for the pool "Disabled"
@@ -72,7 +72,7 @@ Feature: Manage Deployments When I go to the deployments page Then I should see "testdeployment" When I check "testdeployment" deployment
- And I press "Stop"
And I press "stop_button" Then I should see "testdeployment"
Scenario: Stop a deployment over XHR
@@ -82,7 +82,7 @@ Feature: Manage Deployments Then I should get back a partial And I should see "testdeployment" When I check "testdeployment" deployment
- And I press "Stop"
- And I press "stop_button" Then I should get back a partial And I should see "testdeployment"
@@ -96,8 +96,8 @@ Feature: Manage Deployments Given there is a deployment named "Hudson" belonging to "QA Infrastructure" owned by "joe" When I go to Hudson's edit deployment page Then I should see "Edit deployment"
- When I fill in "name" with "Jenkins"
- And I press "Save"
- When I fill in "deployment_name" with "Jenkins"
- And I press "save_button" Then I should be on Jenkins's deployment page And I should see "Jenkins"
@@ -108,7 +108,7 @@ Feature: Manage Deployments Then I should get back a partial And I should see "Edit deployment" When I fill in "name" with "Jenkins"
- And I press "Save"
- And I press "save_button" Then I should get back a partial And I should be on Jenkins's deployment page And I should see "Jenkins"
@@ -152,11 +152,11 @@ Feature: Manage Deployments Scenario: Provider invalid deployable xml URL when launching a deployment Given a pool "mockpool" exists When I am viewing the pool "mockpool"
- And I follow "New Deployment"
- And I follow "new_deployment_button" Then I should see "New Deployment" When I fill in "deployable_url" with "http://invalid.deployable.url/" And I fill in "deployment_name" with "mynewdeployment"
- And I press "Next"
- And I press "next_button" Then I should see "New Deployment" And I should see "Deployment Details" And I should see "failed to get the deployable definition"
@@ -173,12 +173,12 @@ Feature: Manage Deployments | Owner | John testuser | | Name | testdeployment |
- When I follow "Instances"
When I follow "details_instances" Then I should see "testdeployment"
Scenario: Delete a deployment Given there is a deployment named "testdeployment" belonging to "testdeployable" owned by "testuser" And I am on the pools page When I follow "testdeployment"
- And I press "Delete"
- And I press "delete_button" Then I should see "The deployment testdeployment was successfully deleted"
ACK
From: Jiri Tomasek jtomasek@redhat.com
--- src/app/views/suggested_deployables/_form.haml | 2 +- .../views/suggested_deployables/_properties.haml | 6 +++--- src/app/views/suggested_deployables/show.haml | 4 ++-- src/features/suggested_deployables.feature | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/app/views/suggested_deployables/_form.haml b/src/app/views/suggested_deployables/_form.haml index cef100e..324b2e4 100644 --- a/src/app/views/suggested_deployables/_form.haml +++ b/src/app/views/suggested_deployables/_form.haml @@ -12,4 +12,4 @@
%fieldset.options = link_to 'Cancel', suggested_deployables_path, :class => 'button danger' - = submit_tag 'Save', :name => 'save', :class => 'button' + = submit_tag 'Save', :name => 'save', :class => 'button', :id => 'save_button' diff --git a/src/app/views/suggested_deployables/_properties.haml b/src/app/views/suggested_deployables/_properties.haml index e77b624..ba66048 100644 --- a/src/app/views/suggested_deployables/_properties.haml +++ b/src/app/views/suggested_deployables/_properties.haml @@ -8,16 +8,16 @@ %tbody %tr %td - %label Name: + %label{:name => 'name'} Name: %td = @suggested_deployable.name %tr %td - %label Description: + %label{:name => 'description'} Description: %td = @suggested_deployable.description %tr %td - %label URL: + %label{:name => 'url'} URL: %td = @suggested_deployable.url diff --git a/src/app/views/suggested_deployables/show.haml b/src/app/views/suggested_deployables/show.haml index 3b38df6..d5d788d 100644 --- a/src/app/views/suggested_deployables/show.haml +++ b/src/app/views/suggested_deployables/show.haml @@ -4,8 +4,8 @@ #obj_actions.button-container = link_to 'New Suggested Deployable', new_suggested_deployable_url, :class => 'button primary', :id => 'new_suggested_deployable_button' .button-group - = link_to 'Edit', edit_suggested_deployable_path(@suggested_deployable), :class => 'button pill' - = button_to "Delete", suggested_deployable_path(@suggested_deployable), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger' + = link_to 'Edit', edit_suggested_deployable_path(@suggested_deployable), :class => 'button pill', :id => 'edit_button' + = button_to "Delete", suggested_deployable_path(@suggested_deployable), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete_button' .corner
%section.content-section.user diff --git a/src/features/suggested_deployables.feature b/src/features/suggested_deployables.feature index 174b221..b9feb6e 100644 --- a/src/features/suggested_deployables.feature +++ b/src/features/suggested_deployables.feature @@ -9,22 +9,22 @@ Feature: Manage Suggested Deployables
Scenario: Create new deployable Given I am on the suggested deployables page - When I follow "New Deployable" + When I follow "new_deployable_button" Then I should see "Add New Deployable" When I fill in "suggested_deployable[name]" with "test1" When I fill in "suggested_deployable[description]" with "description" When I fill in "suggested_deployable[url]" with "http://random_url" - And I press "Save" + And I press "save_button" Then I should see "Deployable added"
Scenario: Change the name Given a suggested deployable "testdepl" exists And I am on the suggested deployables page When I follow "testdepl" - And I follow "Edit" + And I follow "edit_button" Then I should see "Editing Deployable" When I fill in "suggested_deployable[name]" with "testdepl-renamed" - And I press "Save" + And I press "save_button" Then I should see "Deployable updated successfully!" And I should see "testdepl-renamed"
@@ -34,8 +34,8 @@ Feature: Manage Suggested Deployables When I follow "testdepl" Then I should see "testdepl" And I should see "Name" - And I should see "Description" - And I should see "URL" + And I should see "description" + And I should see "url"
Scenario: Delete deployables Given a suggested deployable "testdepl1" exists @@ -43,7 +43,7 @@ Feature: Manage Suggested Deployables And I am on the suggested deployables page When I check "testdepl1" suggested deployable And I check "testdepl2" suggested deployable - And I press "Delete" + And I press "delete_button" Then there should be only 0 suggested deployables And I should be on the suggested deployables page And I should not see "testdepl1" @@ -53,7 +53,7 @@ Feature: Manage Suggested Deployables Given a suggested deployable "testdepl1" exists And I am on the suggested deployables page When I follow "testdepl1" - And I press "Delete" + And I press "delete_button" Then there should be only 0 suggested deployables And I should be on the suggested deployables page And I should not see "testdepl1"
On 07/18/2011 04:02 PM, jtomasek@redhat.com wrote:
From: Jiri Tomasekjtomasek@redhat.com
src/app/views/suggested_deployables/_form.haml | 2 +- .../views/suggested_deployables/_properties.haml | 6 +++--- src/app/views/suggested_deployables/show.haml | 4 ++-- src/features/suggested_deployables.feature | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/app/views/suggested_deployables/_form.haml b/src/app/views/suggested_deployables/_form.haml index cef100e..324b2e4 100644 --- a/src/app/views/suggested_deployables/_form.haml +++ b/src/app/views/suggested_deployables/_form.haml @@ -12,4 +12,4 @@
%fieldset.options = link_to 'Cancel', suggested_deployables_path, :class => 'button danger'
- = submit_tag 'Save', :name => 'save', :class => 'button'
- = submit_tag 'Save', :name => 'save', :class => 'button', :id => 'save_button'
diff --git a/src/app/views/suggested_deployables/_properties.haml b/src/app/views/suggested_deployables/_properties.haml index e77b624..ba66048 100644 --- a/src/app/views/suggested_deployables/_properties.haml +++ b/src/app/views/suggested_deployables/_properties.haml @@ -8,16 +8,16 @@ %tbody %tr %td
%label Name:
%label{:name => 'name'} Name: %td = @suggested_deployable.name %tr %td
%label Description:
%label{:name => 'description'} Description: %td = @suggested_deployable.description %tr %td
%label URL:
%label{:name => 'url'} URL: %td = @suggested_deployable.url
diff --git a/src/app/views/suggested_deployables/show.haml b/src/app/views/suggested_deployables/show.haml index 3b38df6..d5d788d 100644 --- a/src/app/views/suggested_deployables/show.haml +++ b/src/app/views/suggested_deployables/show.haml @@ -4,8 +4,8 @@ #obj_actions.button-container = link_to 'New Suggested Deployable', new_suggested_deployable_url, :class => 'button primary', :id => 'new_suggested_deployable_button' .button-group
= link_to 'Edit', edit_suggested_deployable_path(@suggested_deployable), :class => 'button pill'
= button_to "Delete", suggested_deployable_path(@suggested_deployable), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger'
= link_to 'Edit', edit_suggested_deployable_path(@suggested_deployable), :class => 'button pill', :id => 'edit_button'
= button_to "Delete", suggested_deployable_path(@suggested_deployable), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete_button'
.corner
%section.content-section.user
diff --git a/src/features/suggested_deployables.feature b/src/features/suggested_deployables.feature index 174b221..b9feb6e 100644 --- a/src/features/suggested_deployables.feature +++ b/src/features/suggested_deployables.feature @@ -9,22 +9,22 @@ Feature: Manage Suggested Deployables
Scenario: Create new deployable Given I am on the suggested deployables page
- When I follow "New Deployable"
- When I follow "new_deployable_button" Then I should see "Add New Deployable" When I fill in "suggested_deployable[name]" with "test1" When I fill in "suggested_deployable[description]" with "description" When I fill in "suggested_deployable[url]" with "http://random_url"
- And I press "Save"
And I press "save_button" Then I should see "Deployable added"
Scenario: Change the name Given a suggested deployable "testdepl" exists And I am on the suggested deployables page When I follow "testdepl"
- And I follow "Edit"
- And I follow "edit_button" Then I should see "Editing Deployable" When I fill in "suggested_deployable[name]" with "testdepl-renamed"
- And I press "Save"
- And I press "save_button" Then I should see "Deployable updated successfully!" And I should see "testdepl-renamed"
@@ -34,8 +34,8 @@ Feature: Manage Suggested Deployables When I follow "testdepl" Then I should see "testdepl" And I should see "Name"
- And I should see "Description"
- And I should see "URL"
And I should see "description"
And I should see "url"
Scenario: Delete deployables Given a suggested deployable "testdepl1" exists
@@ -43,7 +43,7 @@ Feature: Manage Suggested Deployables And I am on the suggested deployables page When I check "testdepl1" suggested deployable And I check "testdepl2" suggested deployable
- And I press "Delete"
- And I press "delete_button" Then there should be only 0 suggested deployables And I should be on the suggested deployables page And I should not see "testdepl1"
@@ -53,7 +53,7 @@ Feature: Manage Suggested Deployables Given a suggested deployable "testdepl1" exists And I am on the suggested deployables page When I follow "testdepl1"
- And I press "Delete"
- And I press "delete_button" Then there should be only 0 suggested deployables And I should be on the suggested deployables page And I should not see "testdepl1"
ACK
Rebased with master
From: Jiri Tomasek jtomasek@redhat.com
--- src/app/views/deployments/_edit.haml | 2 +- src/app/views/deployments/_header_show.haml | 2 +- src/app/views/deployments/_launch_new.haml | 2 +- src/features/deployment.feature | 38 +++++++++++++------------- 4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/app/views/deployments/_edit.haml b/src/app/views/deployments/_edit.haml index 21190b0..66b236e 100644 --- a/src/app/views/deployments/_edit.haml +++ b/src/app/views/deployments/_edit.haml @@ -7,4 +7,4 @@ = text_field :deployment, :name
= submit_tag 'Cancel', :name => 'cancel' - = submit_tag 'Save', :name => 'save' + = submit_tag 'Save', :name => 'save', :id => 'save_button' diff --git a/src/app/views/deployments/_header_show.haml b/src/app/views/deployments/_header_show.haml index ff0fa52..8d03753 100644 --- a/src/app/views/deployments/_header_show.haml +++ b/src/app/views/deployments/_header_show.haml @@ -3,5 +3,5 @@ = [@deployment.name, "Deployment"].join(' ') #obj_actions.button-container .button-group - = button_to 'Delete', deployment_path(@deployment), :method => :delete, :confirm => t("deployments.confirm_delete"), :class => "button pill danger" + = button_to 'Delete', deployment_path(@deployment), :method => :delete, :confirm => t("deployments.confirm_delete"), :class => "button pill danger", :id => 'delete_button' .corner diff --git a/src/app/views/deployments/_launch_new.haml b/src/app/views/deployments/_launch_new.haml index 3e24758..c739286 100644 --- a/src/app/views/deployments/_launch_new.haml +++ b/src/app/views/deployments/_launch_new.haml @@ -40,7 +40,7 @@ = select :deployment, :frontend_realm_id, @realms.map{|r| [r.name, r.id]}, :include_blank => true
%fieldset.options - = submit_tag 'Next', :class => 'button' + = submit_tag 'Next', :class => 'button', :id => "next_button"
:javascript diff --git a/src/features/deployment.feature b/src/features/deployment.feature index bdd9186..8840126 100644 --- a/src/features/deployment.feature +++ b/src/features/deployment.feature @@ -11,7 +11,7 @@ Feature: Manage Deployments Given there is a deployment named "MySQL Cluster" belonging to "Databases" owned by "bob" And I am on the pools page When I follow link with ID "filter_view" - And I follow "Deployments" within "#tab-container-1-nav" + And I follow "details_deployments" within "#tab-container-1-nav" Then I should see "MySQL Cluster" And I should see "bob"
@@ -20,7 +20,7 @@ Feature: Manage Deployments And I am on the pools page And I request XHR When I follow link with ID "filter_view" - And I follow "Deployments" + And I follow "details_deployments" Then I should see "MySQL Cluster" And I should see "bob"
@@ -29,13 +29,13 @@ Feature: Manage Deployments And there is "front_hwp1" conductor hardware profile And there is "front_hwp2" conductor hardware profile When I am viewing the pool "mockpool" - And I follow "New Deployment" + And I follow "new_deployment_button" Then I should see "New Deployment" When I fill in "deployable_url" with "http://localhost/deployables/deployable1.xml" When I fill in "deployment_name" with "mynewdeployment" - When I press "Next" + When I press "next_button" Then I should see "Deployable details" - When I press "Launch" + When I press "launch_deployment" Then I should see "Deployment launched" Then I should see "mynewdeployment Deployment" And I should see "mynewdeployment/frontend" @@ -47,14 +47,14 @@ Feature: Manage Deployments And there is "front_hwp2" conductor hardware profile When I am viewing the pool "mockpool" And I request XHR - And I follow "New Deployment" + And I follow "new_deployment_button" Then I should get back a partial Then I should see "New Deployment" When I fill in "deployable_url" with "http://localhost/deployables/deployable1.xml" When I fill in "deployment_name" with "mynewdeployment" - When I press "Next" + When I press "next_button" Then I should see "Deployable details" - When I press "Launch" + When I press "launch_deployment" Then I should see "Created" Then I should see "mynewdeployment"
@@ -63,7 +63,7 @@ Feature: Manage Deployments And there is "front_hwp1" conductor hardware profile And there is "front_hwp2" conductor hardware profile When I am viewing the pool "Disabled" - And I follow "New Deployment" + And I follow "new_deployment_button" Then I should see "pool has been disabled" And I should be on the page for the pool "Disabled"
@@ -72,7 +72,7 @@ Feature: Manage Deployments When I go to the deployments page Then I should see "testdeployment" When I check "testdeployment" deployment - And I press "Stop" + And I press "stop_button" Then I should see "testdeployment"
Scenario: Stop a deployment over XHR @@ -82,7 +82,7 @@ Feature: Manage Deployments Then I should get back a partial And I should see "testdeployment" When I check "testdeployment" deployment - And I press "Stop" + And I press "stop_button" Then I should get back a partial And I should see "testdeployment"
@@ -96,8 +96,8 @@ Feature: Manage Deployments Given there is a deployment named "Hudson" belonging to "QA Infrastructure" owned by "joe" When I go to Hudson's edit deployment page Then I should see "Edit deployment" - When I fill in "name" with "Jenkins" - And I press "Save" + When I fill in "deployment_name" with "Jenkins" + And I press "save_button" Then I should be on Jenkins's deployment page And I should see "Jenkins"
@@ -108,7 +108,7 @@ Feature: Manage Deployments Then I should get back a partial And I should see "Edit deployment" When I fill in "name" with "Jenkins" - And I press "Save" + And I press "save_button" Then I should get back a partial And I should be on Jenkins's deployment page And I should see "Jenkins" @@ -152,11 +152,11 @@ Feature: Manage Deployments Scenario: Provider invalid deployable xml URL when launching a deployment Given a pool "mockpool" exists When I am viewing the pool "mockpool" - And I follow "New Deployment" + And I follow "new_deployment_button" Then I should see "New Deployment" When I fill in "deployable_url" with "http://invalid.deployable.url/" And I fill in "deployment_name" with "mynewdeployment" - And I press "Next" + And I press "next_button" Then I should see "New Deployment" And I should see "Deployment Details" And I should see "failed to get the deployable definition" @@ -173,14 +173,14 @@ Feature: Manage Deployments | Owner | John testuser | | Name | testdeployment |
- When I follow "Instances" + When I follow "details_instances" Then I should see "testdeployment"
Scenario: Delete a deployment Given there is a deployment named "testdeployment" belonging to "testdeployable" owned by "testuser" And I am on the pools page When I follow "testdeployment" - And I press "Delete" + And I press "delete_button" Then I should see "The deployment testdeployment was scheduled for deletion"
Scenario: Delete a deployment with running instances @@ -189,7 +189,7 @@ Feature: Manage Deployments And the instance "myinstance" is in the running state And I am on the pools page When I follow "mockdeployment" - And I press "Delete" + And I press "delete_button" Then I should see "The deployment mockdeployment was scheduled for deletion"
Scenario: Launch a deployment which is not launchable
From: Jiri Tomasek jtomasek@redhat.com
--- src/app/views/suggested_deployables/_form.haml | 2 +- .../views/suggested_deployables/_properties.haml | 6 +++--- src/app/views/suggested_deployables/show.haml | 4 ++-- src/features/suggested_deployables.feature | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/app/views/suggested_deployables/_form.haml b/src/app/views/suggested_deployables/_form.haml index cef100e..324b2e4 100644 --- a/src/app/views/suggested_deployables/_form.haml +++ b/src/app/views/suggested_deployables/_form.haml @@ -12,4 +12,4 @@
%fieldset.options = link_to 'Cancel', suggested_deployables_path, :class => 'button danger' - = submit_tag 'Save', :name => 'save', :class => 'button' + = submit_tag 'Save', :name => 'save', :class => 'button', :id => 'save_button' diff --git a/src/app/views/suggested_deployables/_properties.haml b/src/app/views/suggested_deployables/_properties.haml index e77b624..ba66048 100644 --- a/src/app/views/suggested_deployables/_properties.haml +++ b/src/app/views/suggested_deployables/_properties.haml @@ -8,16 +8,16 @@ %tbody %tr %td - %label Name: + %label{:name => 'name'} Name: %td = @suggested_deployable.name %tr %td - %label Description: + %label{:name => 'description'} Description: %td = @suggested_deployable.description %tr %td - %label URL: + %label{:name => 'url'} URL: %td = @suggested_deployable.url diff --git a/src/app/views/suggested_deployables/show.haml b/src/app/views/suggested_deployables/show.haml index 3b38df6..d5d788d 100644 --- a/src/app/views/suggested_deployables/show.haml +++ b/src/app/views/suggested_deployables/show.haml @@ -4,8 +4,8 @@ #obj_actions.button-container = link_to 'New Suggested Deployable', new_suggested_deployable_url, :class => 'button primary', :id => 'new_suggested_deployable_button' .button-group - = link_to 'Edit', edit_suggested_deployable_path(@suggested_deployable), :class => 'button pill' - = button_to "Delete", suggested_deployable_path(@suggested_deployable), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger' + = link_to 'Edit', edit_suggested_deployable_path(@suggested_deployable), :class => 'button pill', :id => 'edit_button' + = button_to "Delete", suggested_deployable_path(@suggested_deployable), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete_button' .corner
%section.content-section.user diff --git a/src/features/suggested_deployables.feature b/src/features/suggested_deployables.feature index 174b221..b9feb6e 100644 --- a/src/features/suggested_deployables.feature +++ b/src/features/suggested_deployables.feature @@ -9,22 +9,22 @@ Feature: Manage Suggested Deployables
Scenario: Create new deployable Given I am on the suggested deployables page - When I follow "New Deployable" + When I follow "new_deployable_button" Then I should see "Add New Deployable" When I fill in "suggested_deployable[name]" with "test1" When I fill in "suggested_deployable[description]" with "description" When I fill in "suggested_deployable[url]" with "http://random_url" - And I press "Save" + And I press "save_button" Then I should see "Deployable added"
Scenario: Change the name Given a suggested deployable "testdepl" exists And I am on the suggested deployables page When I follow "testdepl" - And I follow "Edit" + And I follow "edit_button" Then I should see "Editing Deployable" When I fill in "suggested_deployable[name]" with "testdepl-renamed" - And I press "Save" + And I press "save_button" Then I should see "Deployable updated successfully!" And I should see "testdepl-renamed"
@@ -34,8 +34,8 @@ Feature: Manage Suggested Deployables When I follow "testdepl" Then I should see "testdepl" And I should see "Name" - And I should see "Description" - And I should see "URL" + And I should see "description" + And I should see "url"
Scenario: Delete deployables Given a suggested deployable "testdepl1" exists @@ -43,7 +43,7 @@ Feature: Manage Suggested Deployables And I am on the suggested deployables page When I check "testdepl1" suggested deployable And I check "testdepl2" suggested deployable - And I press "Delete" + And I press "delete_button" Then there should be only 0 suggested deployables And I should be on the suggested deployables page And I should not see "testdepl1" @@ -53,7 +53,7 @@ Feature: Manage Suggested Deployables Given a suggested deployable "testdepl1" exists And I am on the suggested deployables page When I follow "testdepl1" - And I press "Delete" + And I press "delete_button" Then there should be only 0 suggested deployables And I should be on the suggested deployables page And I should not see "testdepl1"
aeolus-devel@lists.fedorahosted.org