moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-60548 tests: Get tests passing

Browse source 
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
This commit is contained in:
Eloy Lafuente (stronk7) 2018-04-11 17:15:38 +02:00
parent 4af7042e6e
commit 8c46d204a1
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
enrol/locallib.php
View file

@ -402,6 +402,7 @@ class course_enrolment_manager {
$extrafields = get_extra_user_fields($this->get_context(), array('username', 'lastaccess')); $extrafields = get_extra_user_fields($this->get_context(), array('username', 'lastaccess'));
$extrafields[] = 'username'; $extrafields[] = 'username';
$extrafields[] = 'lastaccess'; $extrafields[] = 'lastaccess';
$extrafields[] = 'maildisplay';
$ufields = user_picture::fields('u', $extrafields); $ufields = user_picture::fields('u', $extrafields);
return array($ufields, $params, $wherecondition); return array($ufields, $params, $wherecondition);

22
user/tests/behat/set_email_display.feature
View file

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