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

Merge branch 'MDL-74612-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE

Browse source
This commit is contained in:
Víctor Déniz 2022-05-05 13:27:03 +01:00
commit 0a2fdafe37
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
admin/tests/behat/filter_users.feature
View file

@ -14,6 +14,10 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
And the following "cohorts" exist: And the following "cohorts" exist:
| name | idnumber | | name | idnumber |
| Cohort 1 | CH1 | | Cohort 1 | CH1 |
And the following "cohort members" exist:
| user | cohort |
| user2 | CH1 |
| user3 | CH1 |
And the following "courses" exist: And the following "courses" exist:
| fullname | shortname | category | | fullname | shortname | category |
| Course 1 | C1 | 0 | | Course 1 | C1 | 0 |
@ -23,8 +27,6 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
| user2 | C1 | student | | user2 | C1 | student |
| user3 | C1 | student | | user3 | C1 | student |
And I log in as "admin" And I log in as "admin"
And I add "User Two (two@example.com)" user to "CH1" cohort members
And I add "User Three (three@example.com)" user to "CH1" cohort members
And I navigate to "Users > Accounts > Browse list of users" in site administration And I navigate to "Users > Accounts > Browse list of users" in site administration
Scenario: Filter user accounts by role and cohort Scenario: Filter user accounts by role and cohort

14
badges/tests/behat/criteria_cohort.feature
View file

@ -401,6 +401,12 @@ Feature: Award badges based on cohort
| user1 | First | User | first@example.com | | user1 | First | User | first@example.com |
| user2 | Second | User | second@example.com | | user2 | Second | User | second@example.com |
| user3 | Third | User | third@example.com | | user3 | Third | User | third@example.com |
And the following "cohort members" exist:
| user | cohort |
| user1 | CH1 |
| user1 | CH2 |
| user2 | CH2 |
| user2 | CH3 |
And I log in as "admin" And I log in as "admin"
And I navigate to "Badges > Add a new badge" in site administration And I navigate to "Badges > Add a new badge" in site administration
And I set the following fields to these values: And I set the following fields to these values:
@ -415,7 +421,7 @@ Feature: Award badges based on cohort
And I press "Save" And I press "Save"
And I press "Enable access" And I press "Enable access"
When I press "Continue" When I press "Continue"
And I should see "Recipients (0)" And I should see "Recipients (1)"
And I navigate to "Badges > Add a new badge" in site administration And I navigate to "Badges > Add a new badge" in site administration
And I set the following fields to these values: And I set the following fields to these values:
| Name | Site Badge 2 | | Name | Site Badge 2 |
@ -429,11 +435,7 @@ Feature: Award badges based on cohort
And I press "Save" And I press "Save"
And I press "Enable access" And I press "Enable access"
And I press "Continue" And I press "Continue"
Then I navigate to "Users > Accounts >Cohorts" in site administration And I should see "Recipients (1)"
And I add "First User (first@example.com)" user to "CH1" cohort members
And I add "First User (first@example.com)" user to "CH2" cohort members
And I add "Second User (second@example.com)" user to "CH2" cohort members
And I add "Second User (second@example.com)" user to "CH3" cohort members
And I log out And I log out
And I log in as "user1" And I log in as "user1"
And I follow "Profile" in the user menu And I follow "Profile" in the user menu