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

Merge branch 'wip-mdl-44910' of https://github.com/rajeshtaneja/moodle

Browse source
This commit is contained in:
Damyon Wiese 2014-04-15 13:16:15 +08:00
commit 12f8adbd25
3 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
report/log/tests/behat/filter_log.feature
View file

@ -18,9 +18,11 @@ Feature: In a report, admin can filter log data
And I log in as "admin" And I log in as "admin"
@javascript @javascript
Scenario: Filter log report for standard 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 "Standard log" "table_row" And I click on "Enable" "link" in the "Legacy log" "table_row"
And I set the following administration settings values:
| Log legacy data | 1 |
And I follow "Home" And I follow "Home"
And I follow "Course 1" And I follow "Course 1"
And I navigate to "Participants" node in "Current course > C1" And I navigate to "Participants" node in "Current course > C1"
@ -41,9 +43,29 @@ Feature: In a report, admin can filter log data
And I should not see "Nothing to display" And I should not see "Nothing to display"
@javascript @javascript
Scenario: Filter log report for legacy log reader. Scenario: Filter log report for standard log reader
Given I set the following administration settings values: Given I follow "Course 1"
| Log legacy data | 0 | And I navigate to "Participants" node in "Current course > C1"
And I follow "Student 1"
And I click on "Log in as" "link"
And I press "Continue"
And I log out
And I log in as "admin"
When I navigate to "Logs" node in "Site administration > Reports"
And I set the field "id" to "Site logs"
And I set the field "user" to "All participants"
And I press "Get these logs"
Then I should see "User logged in as another user"
@javascript
Scenario: Filter log report for legacy log reader
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 "Disable" "link" in the "Standard log" "table_row"
And I set the following administration settings values:
| Log legacy data | 1 |
And I follow "Home"
And I follow "Course 1"
And I follow "Home" And I follow "Home"
And I follow "Course 1" And I follow "Course 1"
And I expand "Users" node And I expand "Users" node

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

@ -16,10 +16,6 @@ Feature: User can view activity log.
| user | course | role | | user | course | role |
| teacher1 | C1 | editingteacher | | teacher1 | C1 | editingteacher |
| student1 | C1 | student | | student1 | C1 | student |
And I log in as "admin"
And I set the following administration settings values:
| Log legacy data | 1 |
And I log out
And I log in as "teacher1" And I log in as "teacher1"
And I follow "Course 1" And I follow "Course 1"
And I turn editing mode on And I turn editing mode on
@ -47,4 +43,4 @@ Feature: User can view activity log.
When I navigate to "Today's logs" node in "Profile settings for Student 1 > Activity reports" When I navigate to "Today's logs" node in "Profile settings for Student 1 > Activity reports"
And I should see "Assignment: Test assignment name" And I should see "Assignment: Test assignment name"
And I navigate to "All logs" node in "Profile settings for Student 1 > Activity reports" And I navigate to "All logs" node in "Profile settings for Student 1 > Activity reports"
And I should see "Assignment: Test assignment name" Then I should see "Assignment: Test assignment name"

4
report/loglive/tests/behat/loglive_report.feature
View file

@ -9,10 +9,10 @@ Feature: In a report, admin can see loglive data
| fullname | shortname | category | groupmode | | fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 | | Course 1 | C1 | 0 | 1 |
And I log in as "admin" And I log in as "admin"
And 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 set the following administration settings values: And I set the following administration settings values:
| Log legacy data | 1 | | Log legacy data | 1 |
And I navigate to "Manage log stores" node in "Site administration>Plugins>Logging"
And I click on "Enable" "link" in the "Standard log" "table_row"
And I am on homepage And I am on homepage
And I follow "Course 1" And I follow "Course 1"
And I turn editing mode on And I turn editing mode on