diff --git a/course/tests/behat/course_request.feature b/course/tests/behat/course_request.feature index 8da4d59fdf9..beb5988578b 100644 --- a/course/tests/behat/course_request.feature +++ b/course/tests/behat/course_request.feature @@ -29,7 +29,7 @@ Feature: Users can request and approve courses | Course short name | Mynewcourse | | Supporting information | pretty please | And I press "Request a course" - And I should see "Your course request has been saved successfully." + And I should see "Course request submitted." And I press "Continue" And I am on course index And I should not see "My new course" diff --git a/enrol/self/tests/self_test.php b/enrol/self/tests/self_test.php index 351fdfeec34..ea5f3d02596 100644 --- a/enrol/self/tests/self_test.php +++ b/enrol/self/tests/self_test.php @@ -800,7 +800,7 @@ class self_test extends \advanced_testcase { ] + (array) $instance, [], $instance, $context); $this->assertArrayHasKey('password', $errors); - $this->assertEquals('Enrolment key matches an existing group enrolment key', $errors['password']); + $this->assertEquals('This enrolment key is already used as a group enrolment key.', $errors['password']); } /** diff --git a/group/tests/behat/backup_restore_groups.feature b/group/tests/behat/backup_restore_groups.feature index 52f562debae..cf3ca40323e 100644 --- a/group/tests/behat/backup_restore_groups.feature +++ b/group/tests/behat/backup_restore_groups.feature @@ -16,11 +16,11 @@ Feature: Backup and restore a course containing groups | teacher1 | C1 | editingteacher | And the following "groups" exist: | name | course | idnumber | visibility | participation | - | Visible to everyone/Participation | C1 | VP | 0 | 1 | + | Visible/Participation | C1 | VP | 0 | 1 | | Only visible to members/Participation | C1 | MP | 1 | 1 | | Only see own membership | C1 | O | 2 | 0 | | Not visible | C1 | N | 3 | 0 | - | Visible to everyone/Non-Participation | C1 | VN | 0 | 0 | + | Visible/Non-Participation | C1 | VN | 0 | 0 | | Only visible to members/Non-Participation | C1 | MN | 1 | 0 | And I log in as "admin" And I backup "Course 1" course using this options: @@ -40,9 +40,9 @@ Feature: Backup and restore a course containing groups Examples: | group | idnumber | visibility | participation | - | Visible to everyone/Participation | VP | 0 | 1 | + | Visible/Participation | VP | 0 | 1 | | Only visible to members/Participation | MP | 1 | 1 | | Only see own membership | O | 2 | 0 | | Not visible | N | 3 | 0 | - | Visible to everyone/Non-Participation | VN | 0 | 0 | + | Visible/Non-Participation | VN | 0 | 0 | | Only visible to members/Non-Participation | MN | 1 | 0 | diff --git a/group/tests/behat/private_groups.feature b/group/tests/behat/private_groups.feature index 604012fe93a..87f9db427f1 100644 --- a/group/tests/behat/private_groups.feature +++ b/group/tests/behat/private_groups.feature @@ -32,11 +32,11 @@ Feature: Private groups | student8 | C1 | student | And the following "groups" exist: | name | course | idnumber | visibility | participation | - | Visible to everyone/Participation | C1 | VP | 0 | 1 | + | Visible/Participation | C1 | VP | 0 | 1 | | Only visible to members/Participation | C1 | MP | 1 | 1 | | Only see own membership | C1 | O | 2 | 0 | | Not visible | C1 | N | 3 | 0 | - | Visible to everyone/Non-Participation | C1 | VN | 0 | 0 | + | Visible/Non-Participation | C1 | VN | 0 | 0 | | Only visible to members/Non-Participation | C1 | MN | 1 | 0 | And the following "group members" exist: | user | group | @@ -53,54 +53,54 @@ Feature: Private groups | student7 | O | | student8 | N | - Scenario: Participants in "Visible to everyone" groups see their membership and other members: + Scenario: Participants in "Visible" groups see their membership and other members: Given I am on the "C1" "enrolled users" page logged in as "student1" Then the following should exist in the "participants" table: | First name / Surname | Groups | - | Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 1 | Visible/Non-Participation, Visible/Participation | | Student 2 | No groups | | Student 3 | No groups | | Student 4 | No groups | - | Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 5 | Visible/Non-Participation, Visible/Participation | | Student 6 | No groups | | Student 7 | No groups | | Student 8 | No groups | - Scenario: Participants in "Only visible to members" groups see their membership and other members, plus "Visible to everyone" + Scenario: Participants in "Only visible to members" groups see their membership and other members, plus "Visible" Given I am on the "C1" "enrolled users" page logged in as "student2" Then the following should exist in the "participants" table: | First name / Surname | Groups | - | Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 1 | Visible/Non-Participation, Visible/Participation | | Student 2 | Only visible to members/Non-Participation, Only visible to members/Participation | | Student 3 | No groups | | Student 4 | No groups | - | Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 5 | Visible/Non-Participation, Visible/Participation | | Student 6 | Only visible to members/Non-Participation, Only visible to members/Participation | | Student 7 | No groups | | Student 8 | No groups | - Scenario: Participants in "Only see own membership" groups see their membership but not other members, plus "Visible to everyone" + Scenario: Participants in "Only see own membership" groups see their membership but not other members, plus "Visible" Given I am on the "C1" "enrolled users" page logged in as "student3" Then the following should exist in the "participants" table: | First name / Surname | Groups | - | Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 1 | Visible/Non-Participation, Visible/Participation | | Student 2 | No groups | | Student 3 | Only see own membership | | Student 4 | No groups | - | Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 5 | Visible/Non-Participation, Visible/Participation | | Student 6 | No groups | | Student 7 | No groups | | Student 8 | No groups | - Scenario: Participants in "Not visible" groups do not see that group, do see "Visible to everyone" + Scenario: Participants in "Not visible" groups do not see that group, do see "Visible" Given I am on the "C1" "enrolled users" page logged in as "student4" Then the following should exist in the "participants" table: | First name / Surname | Groups | - | Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 1 | Visible/Non-Participation, Visible/Participation | | Student 2 | No groups | | Student 3 | No groups | | Student 4 | No groups | - | Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 5 | Visible/Non-Participation, Visible/Participation | | Student 6 | No groups | | Student 7 | No groups | | Student 8 | No groups | @@ -109,11 +109,11 @@ Feature: Private groups Given I am on the "C1" "enrolled users" page logged in as "teacher1" Then the following should exist in the "participants" table: | First name / Surname | Groups | - | Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 1 | Visible/Non-Participation, Visible/Participation | | Student 2 | Only visible to members/Non-Participation, Only visible to members/Participation | | Student 3 | Only see own membership | | Student 4 | Not visible | - | Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 5 | Visible/Non-Participation, Visible/Participation | | Student 6 | Only visible to members/Non-Participation, Only visible to members/Participation | | Student 7 | Only see own membership | | Student 8 | Not visible | @@ -154,10 +154,10 @@ Feature: Private groups And I click on "Apply filters" "button" Then the following should exist in the "participants" table: | First name / Surname | Groups | - | Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 1 | Visible/Non-Participation, Visible/Participation | | Student 2 | No groups | | Student 4 | No groups | - | Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 5 | Visible/Non-Participation, Visible/Participation | | Student 6 | No groups | | Student 7 | No groups | | Student 8 | No groups | @@ -171,6 +171,6 @@ Feature: Private groups And I click on "Apply filters" "button" Then the following should exist in the "participants" table: | First name / Surname | Groups | - | Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 1 | Visible/Non-Participation, Visible/Participation | | Student 3 | Only see own membership | - | Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation | + | Student 5 | Visible/Non-Participation, Visible/Participation | diff --git a/group/tests/behat/update_groups.feature b/group/tests/behat/update_groups.feature index 28400c253f7..2c9d43edccb 100644 --- a/group/tests/behat/update_groups.feature +++ b/group/tests/behat/update_groups.feature @@ -146,7 +146,7 @@ Feature: Automatic updating of groups and groupings Given I set the field "groups" to "Group (with ID)" And I press "Edit group settings" And "visibility" "select" should exist - And the field "Group membership visibility" matches value "Visible to everyone" + And the field "Group membership visibility" matches value "Visible" And the "participation" "checkbox" should be enabled And the field "Show group in dropdown menu for activities in group mode" matches value "1" When the following "group members" exist: @@ -154,6 +154,6 @@ Feature: Automatic updating of groups and groupings | teacher1 | An ID | And I reload the page Then "visibility" "select" should not exist - And "Visible to everyone" "text" should exist + And "Visible" "text" should exist And the "participation" "checkbox" should be disabled And the field "Show group in dropdown menu for activities in group mode" matches value "1" diff --git a/group/tests/reportbuilder/datasource/groups_test.php b/group/tests/reportbuilder/datasource/groups_test.php index fcad5d5cc3d..60adb136869 100644 --- a/group/tests/reportbuilder/datasource/groups_test.php +++ b/group/tests/reportbuilder/datasource/groups_test.php @@ -180,7 +180,7 @@ class groups_test extends core_reportbuilder_testcase { $this->assertEquals('G101', $groupidnumber); $this->assertEquals(format_text($group->description), $groupdescription); $this->assertEquals('S', $groupenrolmentkey); - $this->assertEquals('Visible to everyone', $groupvisibility); + $this->assertEquals('Visible', $groupvisibility); $this->assertEquals('Yes', $groupparticipation); $this->assertEmpty($grouppicture); $this->assertNotEmpty($grouptimecreated); diff --git a/mod/assign/tests/behat/grading_status.feature b/mod/assign/tests/behat/grading_status.feature index 4b0c438f38a..1553d95d1a6 100644 --- a/mod/assign/tests/behat/grading_status.feature +++ b/mod/assign/tests/behat/grading_status.feature @@ -137,10 +137,10 @@ Feature: View the grading status of an assignment | Online text | I'm the student's second submission | And I press "Save changes" And I log out - # Teacher marks the submission again after noticing the 'Graded - follow-up submission received'. + # Teacher marks the submission again after noticing the 'Graded - resubmitted'. And I am on the "Test assignment name" "assign activity" page logged in as teacher1 And I follow "View all submissions" - And I should see "Graded - follow-up submission received" in the "Student 1" "table_row" + And I should see "Graded - resubmitted" in the "Student 1" "table_row" And I wait "10" seconds And I click on "Grade" "link" in the "Student 1" "table_row" And I should see "1 of 1" diff --git a/my/tests/behat/welcome.feature b/my/tests/behat/welcome.feature index 2c7de0b4837..2c4a1bf8dd6 100644 --- a/my/tests/behat/welcome.feature +++ b/my/tests/behat/welcome.feature @@ -29,4 +29,4 @@ Feature: Welcome message And I log out And I should see "You are not logged in" in the "page-footer" "region" And I log in as "admin" - Then I should see "Welcome back, Admin!" in the "page-header" "region" + Then I should see "Hi, Admin!" in the "page-header" "region"