Merge pull request #3642 from 3scale/THREESCALE-10513_dialog_step

🥒 Rename "confirm dialog" step

features/api/alerts.feature

@@ -49,7 +49,7 @@ Feature: Audience > Applications > Alerts
 
   Scenario: Deleting alerts
     Given they go to the alerts page
-    When they press "Delete" in the 1st row and confirm dialog box
+    When they press "Delete" in the 1st row and confirm the dialog
     Then they should see the following table:
       | Account | Application   | Message        | Level   | Time (UTC)               |              |
       | Jane    | Application 1 | foos: 18 of 20 | ≥ 90 %  | 14 Oct 2010 11:11:00 UTC | Delete\nRead |
@@ -58,7 +58,7 @@ Feature: Audience > Applications > Alerts
 
   Scenario: Marking all alerts as read
     Given they go to the alerts page
-    When they select toolbar action "Mark all as read" and confirm dialog box
+    When they select toolbar action "Mark all as read" and confirm the dialog
     Then they should see the following table:
       | Account | Application   | Message        | Level   | Time (UTC)               |        |
       | Jane    | Application 1 | foos: 30 of 20 | ≥ 150 % | 15 Oct 2010 14:14:00 UTC | Delete |
@@ -68,5 +68,5 @@ Feature: Audience > Applications > Alerts
 
   Scenario: Deleting all alerts
     Given they go to the alerts page
-    When they select toolbar action "Delete all" and confirm dialog box
+    When they select toolbar action "Delete all" and confirm the dialog
     Then they should see "All clear"

features/api/backend_usages/index.feature

@@ -51,7 +51,7 @@ Feature: Product > Integration > Backends
 
     Scenario: Deleting a backend config
       When they go to the backends of product "My API"
-      And follow "Delete config with Backend 1" and confirm dialog box
+      And follow "Delete config with Backend 1" and confirm the dialog
       Then they should see the flash message "The Backend was removed from the Product"
       And should see the following table:
         | Name      | Private base URL          | Public path |

features/api/metrics/edit.feature

@@ -25,7 +25,7 @@ Feature: Product > Integration > Metrics > Edit
 
     Scenario: Deleting a method
       Given they go to the edit page of method "Carbonara"
-      When they follow "Delete" and I confirm dialog box
+      When they follow "Delete" and confirm the dialog
       Then should see the flash message "The method was deleted"
       And should not see method "Carbonara"
 
@@ -50,7 +50,7 @@ Feature: Product > Integration > Metrics > Edit
 
     Scenario: Deleting a metric
       Given they go to the edit page of metric "Pasta"
-      When they follow "Delete" and I confirm dialog box
+      When they follow "Delete" and confirm the dialog
       Then should see the flash message "The metric was deleted"
       And should not see metric "Pasta"
 
@@ -61,6 +61,6 @@ Feature: Product > Integration > Metrics > Edit
     Scenario: Cannot delete a metric used in the latest gateway configuration
       Given metric "Pasta" is used in the latest gateway configuration
       When they go to the edit page of metric "Pasta"
-      And follow "Delete" and I confirm dialog box
+      And follow "Delete" and confirm the dialog
       Then should see the flash message "Metric is used by the latest gateway configuration and cannot be deleted"
       And should see metric "Pasta"

features/api/plan_features.feature

@@ -60,6 +60,6 @@ Feature: Plan Features
   @javascript
   Scenario: Delete a feature
     Given I go to the edit page for plan "Basic"
-    When I click "Delete" for the plan feature "Some Feature" and I confirm dialog box
+    When I click "Delete" for the plan feature "Some Feature" and confirm the dialog
     Then I should not see "Some Feature"
     And I should see the flash message "Feature has been deleted."

features/api/services/alerts.feature

@@ -54,7 +54,7 @@ Feature: Product > Analytics > Alerts
 
   Scenario: Deleting alerts
     Given they go to the alerts of "My Product"
-    When they press "Delete" in the 1st row and confirm dialog box
+    When they press "Delete" in the 1st row and confirm the dialog
     Then they should see the following table:
       | Account | Application | Message        | Level   | Time (UTC)               |              |
       | Bob     | Bob App     | foos: 18 of 20 | ≥ 90 %  | 14 Oct 2010 11:11:00 UTC | Delete\nRead |
@@ -63,7 +63,7 @@ Feature: Product > Analytics > Alerts
 
   Scenario: Marking all alerts as read
     Given they go to the alerts of "My Product"
-    When they select toolbar action "Mark all as read" and confirm dialog box
+    When they select toolbar action "Mark all as read" and confirm the dialog
     Then they should see the following table:
       | Account | Application | Message        | Level   | Time (UTC)               |        |
       | Bob     | Bob App     | foos: 30 of 20 | ≥ 150 % | 15 Oct 2010 14:14:00 UTC | Delete |
@@ -73,5 +73,5 @@ Feature: Product > Analytics > Alerts
 
   Scenario: Deleting all alerts
     Given they go to the alerts of "My Product"
-    When they select toolbar action "Delete all" and confirm dialog box
+    When they select toolbar action "Delete all" and confirm the dialog
     Then they should see "All clear"

features/buyers/accounts/bulk_operations.feature

@@ -88,7 +88,7 @@ Feature: Buyer accounts bulk operations
       And select bulk action "Send email"
       And fill in "Subject" with "This is the subject"
       And fill in "Body" with "This is the body"
-      And press "Send" and I confirm dialog box
+      And press "Send" and confirm the dialog
       Then I should see "Successfully sent 2 emails."
       Then "alice@example.com" should receive 1 email
       Then "bob@example.com" should receive 1 email
@@ -106,7 +106,7 @@ Feature: Buyer accounts bulk operations
       And item "Bob" is selected
       And select bulk action "Change account plan"
       And select "Awesome" from "Plan"
-      And press "Change plan" and I confirm dialog box
+      And press "Change plan" and confirm the dialog
       Then should see "Successfully changed the plan of 2 accounts"
       And the table should contain the following:
         | Group/Org.    | Plan    |
@@ -127,7 +127,7 @@ Feature: Buyer accounts bulk operations
       And item "Bob" is selected
       And select bulk action "Change state"
       And select "Make pending" from "Action"
-      And press "Change state" and I confirm dialog box within the modal
+      And press "Change state" and confirm the dialog within the modal
       Then should see "Successfully changed the state of 2 accounts"
       And the table should contain the following:
         | Group/Org.    | State    |
@@ -143,7 +143,7 @@ Feature: Buyer accounts bulk operations
       And select bulk action "Send email"
       And fill in "Subject" with "Error"
       And fill in "Body" with "This will fail"
-      And press "Send" and I confirm dialog box
+      And press "Send" and confirm the dialog
       Then the bulk operation has failed for "Alice"
       And "alice@example.com" should receive no emails
 
@@ -154,7 +154,7 @@ Feature: Buyer accounts bulk operations
       When item "Alice" is selected
       And select bulk action "Change account plan"
       And select "Awesome" from "Plan"
-      And press "Change plan" and I confirm dialog box
+      And press "Change plan" and confirm the dialog
       Then the bulk operation has failed for "Alice"
 
     Scenario: Changing state throws an error
@@ -163,7 +163,7 @@ Feature: Buyer accounts bulk operations
       And item "Pending buyer" is selected
       And select bulk action "Change state"
       When select "Approve" from "Action"
-      And press "Change state" and I confirm dialog box within the modal
+      And press "Change state" and confirm the dialog within the modal
       Then the bulk operation has failed for "Pending buyer"
 
     Scenario: Rejecting buyer accounts in bulk
@@ -180,7 +180,7 @@ Feature: Buyer accounts bulk operations
       And item "Alice" is selected
       And select bulk action "Change state"
       And select "Reject" from "Action"
-      And press "Change state" and I confirm dialog box within the modal
+      And press "Change state" and confirm the dialog within the modal
       Then should see "Successfully changed the state of 4 accounts"
       And the table should contain the following:
         | Group/Org.    | State    |

features/buyers/accounts/edit.feature

@@ -28,7 +28,7 @@ Feature: Audience > Accounts > Edit
   Scenario: Deleting an account
     Given a buyer "Deleteme" of the provider
     When they go to the buyer account edit page for "Deleteme"
-    And follow "Delete" and confirm dialog box
+    And follow "Delete" and confirm the dialog
     Then the current page is the buyer accounts page
     And they should see the flash message "The account was successfully deleted."
     And should see the following table:

features/buyers/service_contracts/bulk_operations.feature

@@ -63,7 +63,7 @@ Feature: Service subscriptions bulk operations
     And select bulk action "Send email"
     And fill in "Subject" with "This is the subject"
     And fill in "Body" with "This is the body"
-    And press "Send" and I confirm dialog box
+    And press "Send" and confirm the dialog
     Then I should see "Successfully sent 2 emails."
     Then "jane@example.com" should receive 1 email
     Then "bob@example.com" should receive 1 email
@@ -80,7 +80,7 @@ Feature: Service subscriptions bulk operations
     And item "Bob" is selected
     And select bulk action "Change service plan"
     And select "Fancy Plan B" from "Plan"
-    And press "Change plan" and I confirm dialog box
+    And press "Change plan" and confirm the dialog
     Then should see "Successfully changed the plan of 2 subscriptions"
     And the table should contain the following:
       | Account | Service     | Plan         |
@@ -107,7 +107,7 @@ Feature: Service subscriptions bulk operations
     And item "Jane" is selected
     And select bulk action "Change state"
     And select "Suspend" from "Action"
-    And press "Change state" and I confirm dialog box within the modal
+    And press "Change state" and confirm the dialog within the modal
     Then should see "Successfully changed the state of 2 subscriptions"
     And the table should contain the following:
       | Account | Service     | State     |
@@ -122,7 +122,7 @@ Feature: Service subscriptions bulk operations
     And select bulk action "Send email"
     And fill in "Subject" with "Error"
     And fill in "Body" with "This will fail"
-    And press "Send" and I confirm dialog box
+    And press "Send" and confirm the dialog
     Then the bulk operation has failed for "Jane"
     And "jane@example.com" should receive no emails
 
@@ -131,7 +131,7 @@ Feature: Service subscriptions bulk operations
     When item "Jane" is selected
     And select bulk action "Change state"
     When select "Suspend" from "Action"
-    And press "Change state" and I confirm dialog box within the modal
+    And press "Change state" and confirm the dialog within the modal
     Then the bulk operation has failed for "Subscription of Jane to service Another API"
     And the table should contain the following:
       | Account | Service     | State |
@@ -146,7 +146,7 @@ Feature: Service subscriptions bulk operations
     And item "Alice" is selected
     And select bulk action "Change service plan"
     And select "Fancy Plan B" from "Plan"
-    And press "Change plan" and I confirm dialog box
+    And press "Change plan" and confirm the dialog
     Then the bulk operation has failed for "Subscription of Alice to service Fancy API"
     And the table should contain the following:
       | Account | Service     | Plan         |

features/master/applications/keys.feature

@@ -12,11 +12,11 @@ Feature: Application Keys management
   @ignore-backend
   Scenario: Regenerate provider key
     Given they are reviewing the provider's application details
-    When follow "Regenerate" and I confirm dialog box
+    When follow "Regenerate" and confirm the dialog
     And fill in "Current password" with "supersecret"
     And press "Confirm Password"
     And should see "You are now in super-user mode! Retry the action, please."
-    And follow "Regenerate" and I confirm dialog box
+    And follow "Regenerate" and confirm the dialog
     Then should see "The key was successfully changed"
 
   Scenario: Set a custom app key

features/old/accounts/invitations.feature

@@ -71,7 +71,7 @@ Feature: Invitations
     And I go to the provider users page
     Then I should see "gentoo@foo.3scale.localhost"
     And I should not see "ubuntu@foo.3scale.localhost"
-    Then I press "Delete" for user "gentoo@foo.3scale.localhost" and I confirm dialog box
+    Then I press "Delete" for user "gentoo@foo.3scale.localhost" and confirm the dialog
     And I go to the provider sent invitations page
     Then I should not see "ubuntu@foo.3scale.localhost"
 
@@ -108,7 +108,7 @@ Feature: Invitations
     And current domain is the admin domain of provider "foo.3scale.localhost"
     When I log in as provider "foo.3scale.localhost"
     And I go to the provider sent invitations page
-    And I press "Delete" for an invitation from account "foo.3scale.localhost" for "alice@foo.3scale.localhost" and I confirm dialog box
+    And I press "Delete" for an invitation from account "foo.3scale.localhost" for "alice@foo.3scale.localhost" and confirm the dialog
     Then I should not see invitation for "alice@foo.3scale.localhost"
 
   @javascript

features/old/accounts/users.feature

@@ -67,7 +67,7 @@ Feature: User management
     And current domain is the admin domain of provider "foo.3scale.localhost"
     When I log in as provider "foo.3scale.localhost"
     And I go to the provider users page
-    Then I press "Delete" for user "alice" and I confirm dialog box
+    Then I press "Delete" for user "alice" and confirm the dialog
     Then I should see "User was successfully deleted"
     And there should be no user with username "alice" of account "foo.3scale.localhost"
 

features/old/applications/buyers/application_management.feature

@@ -122,7 +122,7 @@ Feature: Buyer's application management
     And I go to the applications page
     And I follow "UltraWidget" for application "UltraWidget"
     And I follow "Edit UltraWidget"
-    And I follow "Delete UltraWidget" and I confirm dialog box
+    And I follow "Delete UltraWidget" and confirm the dialog
     Then I should see "Application was successfully deleted."
     And I should be on the applications page
     And I should not see "UltraWidget"

features/old/applications/providers/managing.feature

@@ -33,7 +33,7 @@ Feature: Applications management
     And I follow "FunkyWidget" in the applications widget
     Then I should be on the provider side "FunkyWidget" application page
     Then I follow "Edit"
-    When I follow "Delete" and I confirm dialog box
+    When I follow "Delete" and confirm the dialog
     Then I should see "The application was successfully deleted."
     And I should not see "FunkyWidget"
     # FIXME: this fails for some reason, could we remove it? Does it make sense in this test?
@@ -54,7 +54,7 @@ Feature: Applications management
     Given buyer "bob" has application "MegaWidget"
     And I go to the provider side "MegaWidget" application page
     Then I should see that application "MegaWidget" is live
-    When I follow "Suspend" and I confirm dialog box
+    When I follow "Suspend" and confirm the dialog
     Then I should see that application "MegaWidget" is suspended
     And application "MegaWidget" should be suspended
 

features/old/buyers/accounts/deleting.feature

@@ -12,7 +12,7 @@ Feature: Deleting buyer account
   Scenario: Deleting buyer account from the account summary page
     When I go to the buyer account page for "bob"
     And I follow "Edit"
-    And I follow "Delete" and I confirm dialog box
+    And I follow "Delete" and confirm the dialog
     Then I should be on the buyer accounts page
     And I should see "The account was successfully deleted."
     And I should not see "bob"
@@ -24,5 +24,5 @@ Feature: Deleting buyer account
       | Custom | 42   |
     When I go to the buyer account page for "bob"
     And I follow "Edit"
-    And I follow "Delete" and I confirm dialog box
+    And I follow "Delete" and confirm the dialog
     Then I should see "Invoices need to be settled before"

features/old/buyers/invitations/for_admins.feature

@@ -46,7 +46,7 @@ Feature: Invitations on partner accounts for admins
   Scenario: Destroying invitations
     Given an invitation sent to "alice@lolcats.com" to join account "lol cats"
     When I navigate to the page of the invitations of the partner "lol cats"
-    And I press "Delete" for an invitation from account "lol cats" for "alice@lolcats.com" and I confirm dialog box
+    And I press "Delete" for an invitation from account "lol cats" for "alice@lolcats.com" and confirm the dialog
     Then I should not see invitation for "alice@lolcats.com"
 
   Scenario: Resending invitations

features/old/buyers/users.feature

@@ -51,7 +51,7 @@ Feature: Buyer users management
   Scenario: Delete buyer user
     When I go to the buyer user page for "bob"
     And I follow "Edit"
-    Then I follow "Delete" and I confirm dialog box
+    Then I follow "Delete" and confirm the dialog
     # TODO: confirm step here
     Then I should be on the buyer users page for "SpaceWidgets"
     And I should not see buyer user "bob"

features/old/cms/groups.feature

@@ -21,5 +21,5 @@ Feature: CMS groups
     Then I should be on the groups page
     And I should see "le java enterprisers"
     And I should see "nothing-to-see-here"
-    When I follow "Delete" and I confirm dialog box
+    When I follow "Delete" and confirm the dialog
     Then I should see "Group deleted"

features/old/cms/redirects.feature

@@ -17,5 +17,5 @@ Feature: CMS Redirects
     And I fill in "Source" with "/from/Past"
     And I press "Update Redirect"
     Then I should see "Redirect updated"
-    When I follow "Delete" and I confirm dialog box
+    When I follow "Delete" and confirm the dialog
     Then I should see "Redirect deleted"

features/old/emails.feature

@@ -17,7 +17,7 @@ Feature: Emails
     And buyer "bob" has application "other"
     And I go to the provider side "other" application page
     Then I should see that application "other" is live
-    When I follow "Suspend" and I confirm dialog box
+    When I follow "Suspend" and confirm the dialog
     Then application "other" should be suspended
     And I act as "bob"
     Then I should receive no email with subject "Application has been suspended"

features/old/finance/invoices/create_invoice.feature

@@ -17,6 +17,6 @@ Feature: Create invoice
     And I follow "Create invoice"
     Then I should see "Invoice successfully created"
     And I should see "open"
-    Then I follow "Create invoice" and I confirm dialog box "You cannot create a new invoice for 'zoidberg' since it already has one open. Please issue it before creating a new one."
+    Then I follow "Create invoice" and confirm the dialog "You cannot create a new invoice for 'zoidberg' since it already has one open. Please issue it before creating a new one."
     When I follow "2009-01-00000001"
     Then I should see "Invoice for January 2009"

features/old/plan_changes/provider/change_account_plan.feature

@@ -18,5 +18,5 @@ Feature: Account Plan Change
     And I go to the buyer account page for "bob"
     Then I should see "Change Plan"
     When I select "Advanced" from "account_contract_plan_id"
-    And I press "Change" and I confirm dialog box
+    And I press "Change" and confirm the dialog
     Then I should see "Plan changed to 'Advanced'"

features/old/services/multiservice.feature

@@ -83,5 +83,5 @@ Feature: Multiservice feature
     And provider "foo.3scale.localhost" has "multiple_services" switch allowed
     And a service "Second service" of provider "foo.3scale.localhost"
     And I am on the edit page for service "Second service" of provider "foo.3scale.localhost"
-    When I follow "I understand the consequences, proceed to delete 'Second service' product" and I confirm dialog box
+    When I follow "I understand the consequences, proceed to delete 'Second service' product" and confirm the dialog
     Then I should see "Product 'Second service' will be deleted shortly."