MDL-60548 tests: Get tests passing

This includes:

- changing all usernames in feature to lowercase, for cross-db passing. Fixes:
  - user/tests/behat/set_email_display.feature
- ensure that course_enrolment_manager::get_potential_users() and
  external always returns user->maildisplay attribute, so email
  visibility can be calculated by user_get_user_details(). Fixes:
  - enrol/tests/behat/enrol_user.feature
  - blocks/news_items/tests/behat/display_news.feature
  - course/tests/behat/course_creation.feature

diff --git a/enrol/locallib.php b/enrol/locallib.php
index b31792f..35e61ea 100644 (file)
--- a/enrol/locallib.php
+++ b/enrol/locallib.php
@@ -402,6 +402,7 @@ class course_enrolment_manager {
         $extrafields = get_extra_user_fields($this->get_context(), array('username', 'lastaccess'));
         $extrafields[] = 'username';
         $extrafields[] = 'lastaccess';
+        $extrafields[] = 'maildisplay';
         $ufields = user_picture::fields('u', $extrafields);
 
         return array($ufields, $params, $wherecondition);

diff --git a/user/tests/behat/set_email_display.feature b/user/tests/behat/set_email_display.feature
index f9e23f3..ef6de88 100644 (file)
--- a/user/tests/behat/set_email_display.feature
+++ b/user/tests/behat/set_email_display.feature
@@ -8,30 +8,30 @@ Feature: Set email display preference
     Given the following "users" exist:
       | username  | firstname | lastname    | email                 | maildisplay |
       | teacher1  | Teacher   | 1           | teacher1@example.com  | 2           |
-      | studentP  | Student   | PEER        | studentP@example.com  | 2           |
-      | studentN  | Student   | NONE        | studentN@example.com  | 0           |
-      | studentE  | Student   | EVERYONE    | studentE@example.com  | 1           |
-      | studentM  | Student   | MEMBERS     | studentM@example.com  | 2           |
+      | studentp  | Student   | PEER        | studentP@example.com  | 2           |
+      | studentn  | Student   | NONE        | studentN@example.com  | 0           |
+      | studente  | Student   | EVERYONE    | studentE@example.com  | 1           |
+      | studentm  | Student   | MEMBERS     | studentM@example.com  | 2           |
     And the following "courses" exist:
       | fullname  | shortname | format |
       | Course 1  | C1        | topics |
     And the following "course enrolments" exist:
       | user      | course | role           | status | timeend |
       | teacher1  | C1     | teacher        |    0   |    0    |
-      | studentP  | C1     | student        |    0   |    0    |
-      | studentN  | C1     | student        |    0   |    0    |
-      | studentE  | C1     | student        |    0   |    0    |
-      | studentM  | C1     | student        |    0   |    0    |
+      | studentp  | C1     | student        |    0   |    0    |
+      | studentn  | C1     | student        |    0   |    0    |
+      | studente  | C1     | student        |    0   |    0    |
+      | studentm  | C1     | student        |    0   |    0    |
 
   @javascript
   Scenario: Student viewing own profile
-    Given I log in as "studentP"
+    Given I log in as "studentp"
     When I follow "Profile" in the user menu
     Then I should see "studentP@example.com"
 
   @javascript
   Scenario: Student peer on the same course viewing profiles
-    Given I log in as "studentP"
+    Given I log in as "studentp"
     And I am on "Course 1" course homepage
     And I navigate to course participants
     When I follow "Student NONE"
@@ -45,7 +45,7 @@ Feature: Set email display preference
 
   @javascript
   Scenario: Student viewing teacher email (whose maildisplay = MEMBERS)
-    Given I log in as "studentP"
+    Given I log in as "studentp"
     And I am on "Course 1" course homepage
     And I navigate to course participants
     When I follow "Teacher 1"