mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2017-07-06 15:34:43 +02:00
commit da120d408c
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
report/log/tests/behat/filter_log.feature
View File

@ -17,7 +17,6 @@ Feature: In a report, admin can filter log data
| student1 | C1 | student | | student1 | C1 | student |
And I log in as "admin" And I log in as "admin"
@javascript
Scenario: Filter log report for standard and legacy log reader Scenario: Filter log report for standard and legacy log reader
Given I navigate to "Manage log stores" node in "Site administration > Plugins > Logging" Given I navigate to "Manage log stores" node in "Site administration > Plugins > Logging"
And I click on "Enable" "link" in the "Legacy log" "table_row" And I click on "Enable" "link" in the "Legacy log" "table_row"
@ -42,7 +41,6 @@ Feature: In a report, admin can filter log data
And I should see "user login" And I should see "user login"
And I should not see "Nothing to display" And I should not see "Nothing to display"
@javascript
Scenario: Filter log report for standard log reader Scenario: Filter log report for standard log reader
Given I am on "Course 1" course homepage Given I am on "Course 1" course homepage
And I navigate to course participants And I navigate to course participants
@ -57,7 +55,6 @@ Feature: In a report, admin can filter log data
And I press "Get these logs" And I press "Get these logs"
Then I should see "User logged in as another user" Then I should see "User logged in as another user"
@javascript
Scenario: Filter log report for legacy log reader Scenario: Filter log report for legacy log reader
Given I navigate to "Manage log stores" node in "Site administration > Plugins > Logging" Given I navigate to "Manage log stores" node in "Site administration > Plugins > Logging"
And I click on "Enable" "link" in the "Legacy log" "table_row" And I click on "Enable" "link" in the "Legacy log" "table_row"

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

@ -33,19 +33,17 @@ Feature: User can view activity log.
And I press "Save changes" And I press "Save changes"
And I log out And I log out
@javascript
Scenario: View Todays' and all log report for user Scenario: View Todays' and all log report for user
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 click on "img.userpicture" "css_element" in the "Student 1" "table_row" And I follow "Student 1"
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"
And I follow "All logs" And I follow "All logs"
Then I should see "Assignment: Test assignment name" Then I should see "Assignment: Test assignment name"
@javascript
Scenario: No log reader enabled should be visible when no log store enabled. Scenario: No log reader enabled should be visible when no log store enabled.
Given I log in as "admin" Given I log in as "admin"
And I navigate to "Manage log stores" node in "Site administration > Plugins > Logging" And I navigate to "Manage log stores" node in "Site administration > Plugins > Logging"
@ -54,7 +52,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 click on "img.userpicture" "css_element" in the "Student 1" "table_row" And I follow "Student 1"
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/behat/view_full_profile.feature
View File

@ -42,7 +42,6 @@ Feature: Access to full profiles of users
And I follow "Full profile" And I follow "Full profile"
And I should see "First access to site" And I should see "First access to site"
@javascript
Scenario: Viewing full profiles with forceloginforprofiles off Scenario: Viewing full profiles with forceloginforprofiles off
Given the following config values are set as admin: Given the following config values are set as admin:
| forceloginforprofiles | 0 | | forceloginforprofiles | 0 |
@ -65,7 +64,6 @@ Feature: Access to full profiles of users
And I follow "Full profile" And I follow "Full profile"
Then I should see "First access to site" Then I should see "First access to site"
@javascript
Scenario: Viewing own full profile Scenario: Viewing own full profile
Given I log in as "student1" Given I log in as "student1"
When I follow "Profile" in the user menu When I follow "Profile" in the user menu