MDL-67245 group: Behat updates to account for member identity fields.

diff --git a/admin/tool/behat/tests/behat/data_generators.feature b/admin/tool/behat/tests/behat/data_generators.feature
index f078fab..19644be 100644 (file)
--- a/admin/tool/behat/tests/behat/data_generators.feature
+++ b/admin/tool/behat/tests/behat/data_generators.feature
@@ -259,9 +259,9 @@ Feature: Set up contextual data for tests
     Then the "groups" select box should contain "Group 1 (1)"
     And the "groups" select box should contain "Group 2 (1)"
     And I set the field "groups" to "Group 1 (1)"
-    And the "members" select box should contain "Student 1"
+    And the "members" select box should contain "Student 1 (student1@example.com)"
     And I set the field "groups" to "Group 2 (1)"
-    And the "members" select box should contain "Student 2"
+    And the "members" select box should contain "Student 2 (student2@example.com)"
 
   Scenario: Add cohorts and cohort members with data generator
     Given the following "categories" exist:

diff --git a/admin/tool/behat/tests/behat/get_and_set_fields.feature b/admin/tool/behat/tests/behat/get_and_set_fields.feature
index 9ade5e0..3f1d88e 100644 (file)
--- a/admin/tool/behat/tests/behat/get_and_set_fields.feature
+++ b/admin/tool/behat/tests/behat/get_and_set_fields.feature
@@ -147,13 +147,13 @@ Feature: Verify that all form fields values can be get and set
     And I navigate to "Users > Groups" in current page administration
     # Select (multi-select & AJAX) - Checking "I set the field" and "select box should contain".
     And I set the field "groups" to "Group 2"
-    And the "members" select box should contain "Student 2"
-    And the "members" select box should contain "Student 3"
-    And the "members" select box should not contain "Student 1"
+    And the "members" select box should contain "Student 2 (s2@example.com)"
+    And the "members" select box should contain "Student 3 (s3@example.com)"
+    And the "members" select box should not contain "Student 1 (s1@example.com)"
     And I set the field "groups" to "Group 1"
-    And the "members" select box should contain "Student 1"
-    And the "members" select box should contain "Student 2"
-    And the "members" select box should not contain "Student 3"
+    And the "members" select box should contain "Student 1 (s1@example.com)"
+    And the "members" select box should contain "Student 2 (s2@example.com)"
+    And the "members" select box should not contain "Student 3 (s3@example.com)"
     # Checkbox (AJAX) - Checking "I set the field" and "I set the following fields to these values".
     And I am on "Course 1" course homepage
     And I add a "Lesson" to section "1"

diff --git a/admin/tool/uploaduser/tests/behat/upload_users.feature b/admin/tool/uploaduser/tests/behat/upload_users.feature
index a92b633..fc55002 100644 (file)
--- a/admin/tool/uploaduser/tests/behat/upload_users.feature
+++ b/admin/tool/uploaduser/tests/behat/upload_users.feature
@@ -36,7 +36,7 @@ Feature: Upload users
     And I am on "Maths" course homepage
     And I navigate to "Users > Groups" in current page administration
     And I set the field "groups" to "Section 1 (1)"
-    And the "members" select box should contain "Tom Jones"
+    And the "members" select box should contain "Tom Jones (jonest@example.com)"
 
   @javascript
   Scenario: Upload users enrolling them on courses and groups applying defaults