MDL-43584 behat: Updating features to use the new expected arguments

diff --git a/admin/tests/behat/filter_users.feature b/admin/tests/behat/filter_users.feature
index bb5e657..4b7f6ef 100644 (file)
--- a/admin/tests/behat/filter_users.feature
+++ b/admin/tests/behat/filter_users.feature
@@ -8,9 +8,9 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     Given the following "users" exists:
       | username | firstname | lastname | email | auth | confirmed |
       | user1 | User | One | one@asd.com | manual | 0 |
-      | user2 | User | Two | one@asd.com | ldap | 1 |
-      | user3 | User | Three | one@asd.com | manual | 1 |
-      | user4 | User | Four | one@asd.com | ldap | 0 |
+      | user2 | User | Two | two@asd.com | ldap | 1 |
+      | user3 | User | Three | three@asd.com | manual | 1 |
+      | user4 | User | Four | four@asd.com | ldap | 0 |
     And the following "cohorts" exists:
       | name | idnumber |
       | Cohort 1 | CH1 |
@@ -23,8 +23,8 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
       | user2 | C1 | student |
       | user3 | C1 | student |
     And I log in as "admin"
-    And I add "user2" user to "CH1" cohort
-    And I add "user3" user to "CH1" cohort
+    And I add "User Two (two@asd.com)" user to "CH1" cohort members
+    And I add "User Three (three@asd.com)" user to "CH1" cohort members
     And I follow "Browse list of users"
 
   @javascript

diff --git a/cohort/tests/behat/add_cohort.feature b/cohort/tests/behat/add_cohort.feature
index 2c6ba7b..2021edc 100644 (file)
--- a/cohort/tests/behat/add_cohort.feature
+++ b/cohort/tests/behat/add_cohort.feature
@@ -35,8 +35,8 @@ Feature: Add cohorts of users
 
   @javascript
   Scenario: Add users to a cohort selecting them from the system users list
-    When I add "user1" user to "333" cohort
-    And I add "user2" user to "333" cohort
+    When I add "First User (first@user.com)" user to "333" cohort members
+    And I add "Second User (second@user.com)" user to "333" cohort members
     Then I should see "2" in the "#cohorts" "css_element"
     And I follow "Assign"
     And the "Current users" select box should contain "First User (first@user.com)"

diff --git a/group/tests/behat/create_groups.feature b/group/tests/behat/create_groups.feature
index 7ec7622..e2ce592 100644 (file)
--- a/group/tests/behat/create_groups.feature
+++ b/group/tests/behat/create_groups.feature
@@ -35,10 +35,10 @@ Feature: Organize students into groups
     And I fill the moodle form with:
       | Group name | Group 2 |
     And I press "Save changes"
-    When I add "student0" user to "Group 1" group
-    And I add "student1" user to "Group 1" group
-    And I add "student2" user to "Group 2" group
-    And I add "student3" user to "Group 2" group
+    When I add "Student 0 (student0@asd.com)" user to "Group 1" group members
+    And I add "Student 1 (student1@asd.com)" user to "Group 1" group members
+    And I add "Student 2 (student2@asd.com)" user to "Group 2" group members
+    And I add "Student 3 (student3@asd.com)" user to "Group 2" group members
     Then I select "Group 1 (2)" from "groups"
     And the "members" select box should contain "Student 0"
     And the "members" select box should contain "Student 1"

diff --git a/message/tests/behat/display_history.feature b/message/tests/behat/display_history.feature
index dbfae92..8fb9a7c 100644 (file)
--- a/message/tests/behat/display_history.feature
+++ b/message/tests/behat/display_history.feature
@@ -10,16 +10,16 @@ Feature: Message history displays correctly
       | user1 | User | One | one@asd.com |
       | user2 | User | Two | two@asd.com |
     And I log in as "user1"
-    And I send "Message 1 from user1 to user2" message to "user2"
-    And I send "Message 2 from user1 to user2" message to "user2"
-    And I send "Message 3 from user1 to user2" message to "user2"
-    And I send "Message 4 from user1 to user2" message to "user2"
-    And I send "Message 5 from user1 to user2" message to "user2"
-    And I send "Message 6 from user1 to user2" message to "user2"
-    And I send "Message 7 from user1 to user2" message to "user2"
-    And I send "Message 8 from user1 to user2" message to "user2"
-    And I send "Message 9 from user1 to user2" message to "user2"
-    And I send "Message 10 from user1 to user2" message to "user2"
+    And I send "Message 1 from user1 to user2" message to "User Two" user
+    And I send "Message 2 from user1 to user2" message to "User Two" user
+    And I send "Message 3 from user1 to user2" message to "User Two" user
+    And I send "Message 4 from user1 to user2" message to "User Two" user
+    And I send "Message 5 from user1 to user2" message to "User Two" user
+    And I send "Message 6 from user1 to user2" message to "User Two" user
+    And I send "Message 7 from user1 to user2" message to "User Two" user
+    And I send "Message 8 from user1 to user2" message to "User Two" user
+    And I send "Message 9 from user1 to user2" message to "User Two" user
+    And I send "Message 10 from user1 to user2" message to "User Two" user
 
   Scenario: View sent messages
     When I expand "My profile" node

diff --git a/message/tests/behat/manage_contacts.feature b/message/tests/behat/manage_contacts.feature
index b69204e..2685763 100644 (file)
--- a/message/tests/behat/manage_contacts.feature
+++ b/message/tests/behat/manage_contacts.feature
@@ -10,8 +10,8 @@ Feature: Manage contacts
       | user1 | User | One | one@asd.com |
       | user2 | User | Two | two@asd.com |
     And I log in as "user1"
-    And I send "Message 1 from user1 to user2" message to "user2"
-    And I send "Message 2 from user1 to user2" message to "user2"
+    And I send "Message 1 from user1 to user2" message to "User Two" user
+    And I send "Message 2 from user1 to user2" message to "User Two" user
     And I expand "My profile" node
     And I click on "Messages" "link" in the "Navigation" "block"
     And I fill in "Search people and messages" with "User Two"

diff --git a/message/tests/behat/search_history.feature b/message/tests/behat/search_history.feature
index b842a94..acfa6d4 100644 (file)
--- a/message/tests/behat/search_history.feature
+++ b/message/tests/behat/search_history.feature
@@ -10,7 +10,7 @@ Feature: Users can search their message history
       | user1 | User | One | one@asd.com |
       | user2 | User | Two | two@asd.com |
     And I log in as "user1"
-    When I send "Give me your biscuits" message to "user2"
+    When I send "Give me your biscuits" message to "User Two" user
     And I expand "My profile" node
     And I click on "Messages" "link" in the "Navigation" "block"
     And I fill in "Search people and messages" with "your biscuits"

diff --git a/mod/assign/tests/behat/group_submission.feature b/mod/assign/tests/behat/group_submission.feature
index 62675ce..1487284 100644 (file)
--- a/mod/assign/tests/behat/group_submission.feature
+++ b/mod/assign/tests/behat/group_submission.feature
@@ -50,8 +50,8 @@ Feature: Group assignment submissions
     And I press "Save changes"
     And I expand "Users" node
     And I follow "Groups"
-    And I add "student0" user to "Group 1" group
-    And I add "student1" user to "Group 1" group
+    And I add "Student 0 (student0@asd.com)" user to "Group 1" group members
+    And I add "Student 1 (student1@asd.com)" user to "Group 1" group members
     And I follow "Course 1"
     And I follow "Test assignment name"
     And I follow "View/grade all submissions"