[PATCH conductor 2/2] Cucumber test fixes to match string changes

Matt Wagner matt.wagner at redhat.com
Thu Aug 16 15:50:23 UTC 2012


---
 src/features/authentication.feature             |    2 +-
 src/features/catalogs.feature                   |    4 ++--
 src/features/config_server.feature              |   18 +++++++++---------
 src/features/deployment.feature                 |    4 ++--
 src/features/instance.feature                   |    8 ++++----
 src/features/provider.feature                   |    2 +-
 src/features/provider_account.feature           |    8 ++++----
 src/features/role.feature                       |    2 +-
 src/features/settings.feature                   |    2 +-
 src/features/step_definitions/authentication.rb |    4 ++--
 src/features/user.feature                       |    8 ++++----
 11 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/features/authentication.feature b/src/features/authentication.feature
index 5fc5d07..0acfebb 100644
--- a/src/features/authentication.feature
+++ b/src/features/authentication.feature
@@ -24,7 +24,7 @@ Feature: User authentication
     When I fill in "E-mail" with "changed at example.com"
     And I press "Save"
     Then I should be on the my user page
-    And I should see "User updated!"
+    And I should see "User updated"
 
   Scenario: log out
     Given I am an authorised user
diff --git a/src/features/catalogs.feature b/src/features/catalogs.feature
index 7baa763..525f176 100644
--- a/src/features/catalogs.feature
+++ b/src/features/catalogs.feature
@@ -42,7 +42,7 @@ Feature: Manage Catalogs
     And I press "delete"
     Then I should be on the catalogs page
     And I should not see "Bad"
-    And I should see "Catalog deleted!"
+    And I should see "Catalog deleted"
 
   Scenario: Delete multiple catalogs
     Given there is a "bad" catalog
@@ -52,7 +52,7 @@ Feature: Manage Catalogs
     And I check "worse" catalog
     And I press "delete_button"
     Then I should be on the catalogs page
-    And I should see "2 catalogs bad, worse deleted!"
+    And I should see "2 Catalogs bad, worse deleted"
 
   Scenario: Search catalogs
     Given there is a "mycatalog" catalog
diff --git a/src/features/config_server.feature b/src/features/config_server.feature
index 4b4a944..3a5d23c 100644
--- a/src/features/config_server.feature
+++ b/src/features/config_server.feature
@@ -23,7 +23,7 @@ Feature: Config Servers
     And I fill in "config_server[secret]" with "valid"
     And I press "Save"
     Then I should be on mock's provider mock_account's provider account page
-    And I should see "Config server added"
+    And I should see "Config Server added"
     And I should see "[ Edit ]" within "#config_server_control"
 
   # This is essentially the same scenario as the first, but creates
@@ -41,8 +41,8 @@ Feature: Config Servers
     And I fill in "config_server[key]" with "valid"
     And I fill in "config_server[secret]" with "valid"
     And I press "Save"
-    Then I should see "The config server information is invalid"
-    And I should see "Could not validate config server connection"
+    Then I should see "The config Server information is invalid"
+    And I should see "Could not validate Config Server connection"
 
   # This is essentially the same scenario as the first, but creates
   # a different stubbed ConfigServer, so it fails
@@ -59,8 +59,8 @@ Feature: Config Servers
     When I fill in "config_server[key]" with "invalid"
     When I fill in "config_server[secret]" with "invalid"
     And I press "Save"
-    Then I should see "The config server information is invalid"
-    And I should see "Could not validate config server connection"
+    Then I should see "The config Server information is invalid"
+    And I should see "Could not validate Config Server connection"
 
   Scenario: I should be able to edit a config server
     Given I am on the homepage
@@ -71,7 +71,7 @@ Feature: Config Servers
     Then I should be on the edit config server page for account "mock_account"
     And I press "Save"
     Then I should be on mock's provider mock_account's provider account page
-    And I should see "Config server updated"
+    And I should see "Config Server updated"
 
   Scenario: I should be able to delete an existing config server
     Given I am on the homepage
@@ -79,7 +79,7 @@ Feature: Config Servers
     When I go to mock'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"
+    Then I should see "Config Server was deleted"
     And I should be on mock's provider mock_account's provider account page
 
   Scenario: I should be able to test a correctly configured and available config server
@@ -97,7 +97,7 @@ Feature: Config Servers
     When I go to mock'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"
+    Then I should see "Could not validate Config Server connection"
     And I should see "Unauthorized"
 
   Scenario: I should see an error when I test a config server with an invalid endpoint
@@ -106,5 +106,5 @@ Feature: Config Servers
     When I go to mock'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"
+    Then I should see "Could not validate Config Server connection"
     And I should see "Connection timed out"
diff --git a/src/features/deployment.feature b/src/features/deployment.feature
index 15e54c5..6eef708 100644
--- a/src/features/deployment.feature
+++ b/src/features/deployment.feature
@@ -89,7 +89,7 @@ Feature: Manage Deployments
     Then I should see "testdeployment"
     When I check "testdeployment" deployment
     And I press "stop_button"
-    Then I should see "deployment testdeployment could not be stopped"
+    Then I should see "The Deployment testdeployment could not be stopped"
 
   Scenario: Stop inaccessible deployments
     Given there is a deployment named "testdeployment" belonging to "testdeployable" owned by "testuser"
@@ -101,7 +101,7 @@ Feature: Manage Deployments
     And I press "stop_button"
     Then I should see "Terminate Instances"
     When I press "terminate_button"
-    Then I should see "state changed to stopped"
+    Then I should see "State changed to stopped"
 
 
   Scenario: Stop a deployment over XHR
diff --git a/src/features/instance.feature b/src/features/instance.feature
index 446ee53..eae5aac 100644
--- a/src/features/instance.feature
+++ b/src/features/instance.feature
@@ -69,7 +69,7 @@ Feature: Manage Instances
     When I check "mock1" instance
     And I press "stop_selected_instances"
     Then I should be on the instances page
-    And I should see "mock1: stop action was successfully queued"
+    And I should see "mock1: The Stop action was successfully queued"
 
   Scenario: Stop inaccessible instance
     Given there is a "mock1" running instance
@@ -80,7 +80,7 @@ Feature: Manage Instances
     Then I should see "Terminate Instances"
     And I should see "mock1"
     When I press "terminate_button"
-    Then I should see "mock1: state changed to stopped"
+    Then I should see "mock1: State changed to stopped"
 
   Scenario: Stop multiple instances
     Given there is a "mock1" running instance
@@ -92,8 +92,8 @@ Feature: Manage Instances
     And I check "mock3" instance
     And I press "stop_selected_instances"
     Then I should be on the instances page
-    And I should see "mock1: stop action was successfully queued"
-    And I should see "mock2: stop action was successfully queued"
+    And I should see "mock1: The Stop action was successfully queued"
+    And I should see "mock2: The Stop action was successfully queued"
     And I should see "mock3: stop is an invalid action"
 
   # not supported in UI now
diff --git a/src/features/provider.feature b/src/features/provider.feature
index e5ca8dc..5b4715d 100644
--- a/src/features/provider.feature
+++ b/src/features/provider.feature
@@ -86,7 +86,7 @@ Feature: Manage Providers
     And provider "provider1" is not accessible
     When I go to the provider1's edit provider page
     And I press "provider_submit"
-    Then I should see "Provider is not accessible, status of following instances will be changed to 'stopped'"
+    Then I should see "Provider is not accessible. The status of following Instances will be changed to 'stopped' but their actual state is unknown."
     When I press "disable_button"
     Then I should be on the provider1's edit provider page
     And I should see "Provider is disabled."
diff --git a/src/features/provider_account.feature b/src/features/provider_account.feature
index 58668a8..b129423 100644
--- a/src/features/provider_account.feature
+++ b/src/features/provider_account.feature
@@ -55,8 +55,8 @@ Feature: Manage Provider Accounts
     And I fill in "provider_account[credentials_hash][password]" with "wrongpassword"
     And I fill in "quota[maximum_running_instances]" with "13"
     And I press "Save"
-    Then I should see "Cannot add the provider account."
-    Then I should see "Login credentials are invalid for this provider"
+    Then I should see "Cannot add the Provider account."
+    Then I should see "Login credentials are invalid for this Provider"
 
   Scenario: Delete a provider account
     Given there is a provider named "testprovider"
@@ -95,7 +95,7 @@ Feature: Manage Provider Accounts
     When I follow "Edit"
     And I fill in "provider_account[label]" with "testaccount_updated"
     And I press "Save"
-    Then I should see "Provider Account updated!" within ".flashes"
+    Then I should see "Provider Account updated." within ".flashes"
 
   Scenario: Edit a existing Provider Account with invalid credentials
     Given there is a provider named "testprovider"
@@ -105,7 +105,7 @@ Feature: Manage Provider Accounts
     When I follow "Edit"
     And I fill in "provider_account[label]" with ""
     And I press "Save"
-    Then I should see "Provider Account wasn't updated!"
+    Then I should see "Provider Account wasn't updated."
 
   Scenario: Display alert when Provider Account Quota is over 70% filled
     Given there is a provider named "testprovider"
diff --git a/src/features/role.feature b/src/features/role.feature
index bb83e2e..330ae95 100644
--- a/src/features/role.feature
+++ b/src/features/role.feature
@@ -17,7 +17,7 @@ Feature: Manage Roles
     Then I should see "Editing Role:"
     When I fill in "role[name]" with "Admiral"
     And I press "Save"
-    Then I should see "Role updated successfully!"
+    Then I should see "Role updated successfully"
 
   Scenario: Show role details
     Given a role "Admiral" exists
diff --git a/src/features/settings.feature b/src/features/settings.feature
index 99505d0..15ae444 100644
--- a/src/features/settings.feature
+++ b/src/features/settings.feature
@@ -12,7 +12,7 @@ Feature: Manage System wide Settings
     And I am on the self service settings page
     When I fill in "self_service_default_quota[maximum_running_instances]" with "8"
     And I press "Save"
-    Then I should see "Settings Updated!"
+    Then I should see "Settings Updated."
     And the default quota should be 8
     And I should be on the self service settings page
 
diff --git a/src/features/step_definitions/authentication.rb b/src/features/step_definitions/authentication.rb
index 418e7a3..fa45097 100644
--- a/src/features/step_definitions/authentication.rb
+++ b/src/features/step_definitions/authentication.rb
@@ -57,7 +57,7 @@ end
 
 When /^I login as authorised user$/ do
   login(@admin_user.login, @admin_user.password)
-  page.should have_content('Login successful!')
+  page.should have_content('Login successful')
 end
 
 Given /^I am a new user$/ do
@@ -73,7 +73,7 @@ end
 Given /^I have successfully logged in$/ do
   page.driver.header 'Accept-Language', 'en-US'
   login(user.login, user.password)
-  page.should have_content('Login successful!')
+  page.should have_content('Login successful')
 end
 
 Given /^there are not any roles$/ do
diff --git a/src/features/user.feature b/src/features/user.feature
index b3bdea9..550cc99 100644
--- a/src/features/user.feature
+++ b/src/features/user.feature
@@ -25,9 +25,9 @@ Feature: Manage Users
     When I fill in "user[password]" with "new password"
     And I fill in "user[password_confirmation]" with "new password"
     And I press "Save"
-    Then I should see "User updated!"
+    Then I should see "User updated"
 
-  Scenario: Show user detials
+  Scenario: Show user details
     Given I am on the users page
     And there is a user "testuser"
     When I follow "testuser"
@@ -68,7 +68,7 @@ Feature: Manage Users
       | E-mail            | testuser2 at example.com |
     And I press "Save"
     Then I should be on the users page
-    And I should see "User registered!"
+    And I should see "User registered"
 
   Scenario: Want to register new user but decide to cancel
     Given I am on the users page
@@ -96,7 +96,7 @@ Feature: Manage Users
     And I fill in "user_first_name" with "Joe"
     When I press "Save"
     Then I should be on testuser's user page
-    And I should see "User updated!"
+    And I should see "User updated"
     And I should see "Joe"
 
   Scenario: Display failed login count
-- 
1.7.7.6




More information about the aeolus-devel mailing list