From c55b5aa305f68605200647962230d4bf81efc02b Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Fri, 29 Apr 2022 16:09:35 +0100 Subject: [PATCH] MDL-74612 cohort: use data generator for populating cohort members. --- admin/tests/behat/filter_users.feature | 6 ++++-- badges/tests/behat/criteria_cohort.feature | 14 ++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/admin/tests/behat/filter_users.feature b/admin/tests/behat/filter_users.feature index c11b6133e94..85564239b09 100644 --- a/admin/tests/behat/filter_users.feature +++ b/admin/tests/behat/filter_users.feature @@ -14,6 +14,10 @@ Feature: An administrator can filter user accounts by role, cohort and other pro And the following "cohorts" exist: | name | idnumber | | Cohort 1 | CH1 | + And the following "cohort members" exist: + | user | cohort | + | user2 | CH1 | + | user3 | CH1 | And the following "courses" exist: | fullname | shortname | category | | Course 1 | C1 | 0 | @@ -23,8 +27,6 @@ Feature: An administrator can filter user accounts by role, cohort and other pro | user2 | C1 | student | | user3 | C1 | student | 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 Scenario: Filter user accounts by role and cohort diff --git a/badges/tests/behat/criteria_cohort.feature b/badges/tests/behat/criteria_cohort.feature index e0578debdf7..8ae8fe704e1 100644 --- a/badges/tests/behat/criteria_cohort.feature +++ b/badges/tests/behat/criteria_cohort.feature @@ -401,6 +401,12 @@ Feature: Award badges based on cohort | user1 | First | User | first@example.com | | user2 | Second | User | second@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 navigate to "Badges > Add a new badge" in site administration 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 "Enable access" 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 set the following fields to these values: | Name | Site Badge 2 | @@ -429,11 +435,7 @@ Feature: Award badges based on cohort And I press "Save" And I press "Enable access" And I press "Continue" - Then I navigate to "Users > Accounts >Cohorts" in site administration - 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 should see "Recipients (1)" And I log out And I log in as "user1" And I follow "Profile" in the user menu