mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-30 20:39:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-59395_master-fix' of github.com:markn86/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2017-07-06 15:20:41 +08:00
commit d5d70e57a4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
report/log/tests/behat/user_log.feature
View File

@ -38,7 +38,7 @@ Feature: User can view activity log.
Given I log in as "teacher1" Given I log in as "teacher1"
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
And I follow "Student 1" And I click on "img.userpicture" "css_element" in the "Student 1" "table_row"
When I follow "Today's logs" When I follow "Today's logs"
And I should see "Assignment: Test assignment name" And I should see "Assignment: Test assignment name"
And I follow "Student 1" And I follow "Student 1"
@ -54,7 +54,7 @@ Feature: User can view activity log.
And I log in as "teacher1" And I log in as "teacher1"
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
And I follow "Student 1" And I click on "img.userpicture" "css_element" in the "Student 1" "table_row"
When I follow "Today's logs" When I follow "Today's logs"
And I should see "No log reader enabled" And I should see "No log reader enabled"
And I follow "Student 1" And I follow "Student 1"

2
user/tests/userlib_test.php
View File

@ -867,7 +867,7 @@ class core_userliblib_testcase extends advanced_testcase {
// Now, when we perform the following search we should only return 2 users. Users who belong to // Now, when we perform the following search we should only return 2 users. Users who belong to
// the group and have the name 'searchforthis' and have also accessed the site in the last day. // the group and have the name 'searchforthis' and have also accessed the site in the last day.
$userset = user_get_participants(SITEID, $group->id, $accesssince + 1, 0, 'searchforthis'); $userset = user_get_participants(SITEID, $group->id, $accesssince + 1, 0, 'searchforthis', '', array(), 'ORDER BY id ASC');
$this->assertEquals($user1->id, $userset->current()->id); $this->assertEquals($user1->id, $userset->current()->id);
$userset->next(); $userset->next();