From 647628e839e0a47d4c9452cb4659ee1739c8b6e3 Mon Sep 17 00:00:00 2001 From: Mark Johnson Date: Tue, 14 Feb 2023 11:44:49 +0000 Subject: [PATCH] MDL-68093 lesson: Add behat test for non-participation groups --- mod/lesson/override_form.php | 2 +- .../tests/behat/lesson_group_override.feature | 2 +- .../tests/behat/teacher_grade_essays.feature | 29 ++++++++++++++++--- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/mod/lesson/override_form.php b/mod/lesson/override_form.php index 0674a18cd8d..f115993d3fa 100644 --- a/mod/lesson/override_form.php +++ b/mod/lesson/override_form.php @@ -113,7 +113,7 @@ class lesson_override_form extends moodleform { $groupchoices = array(); foreach ($groups as $group) { - if ($group->visibility != \core_group\visibility::NONE) { + if ($group->visibility != GROUPS_VISIBILITY_NONE) { $groupchoices[$group->id] = format_string($group->name, true, $this->context); } } diff --git a/mod/lesson/tests/behat/lesson_group_override.feature b/mod/lesson/tests/behat/lesson_group_override.feature index 338601619b1..d44888dc0e9 100644 --- a/mod/lesson/tests/behat/lesson_group_override.feature +++ b/mod/lesson/tests/behat/lesson_group_override.feature @@ -388,4 +388,4 @@ Feature: Lesson group override And I should see "Visible to members" in the "Override group" "select" And I should see "Visible to members/Non-Participation" in the "Override group" "select" And I should see "See own membership" in the "Override group" "select" - And I should not see "Not visible" in the "Override group" "select" \ No newline at end of file + And I should not see "Not visible" in the "Override group" "select" diff --git a/mod/lesson/tests/behat/teacher_grade_essays.feature b/mod/lesson/tests/behat/teacher_grade_essays.feature index 896488a0e27..2f169e81046 100644 --- a/mod/lesson/tests/behat/teacher_grade_essays.feature +++ b/mod/lesson/tests/behat/teacher_grade_essays.feature @@ -11,6 +11,8 @@ Feature: In a lesson activity, a non editing teacher can grade essay questions | student1 | Student | 1 | student1@example.com | | student2 | Student | 2 | student2@example.com | | student3 | Student | 3 | student3@example.com | + | student4 | Student | 4 | student4@example.com | + | student5 | Student | 5 | student5@example.com | And the following "courses" exist: | fullname | shortname | category | | Course 1 | C1 | 0 | @@ -21,11 +23,14 @@ Feature: In a lesson activity, a non editing teacher can grade essay questions | student1 | C1 | student | | student2 | C1 | student | | student3 | C1 | student | + | student4 | C1 | student | + | student5 | C1 | student | And the following "groups" exist: - | name | course | idnumber | - | Group A | C1 | G1 | - | Group B | C1 | G2 | - | Group C | C1 | G3 | + | name | course | idnumber | participation | + | Group A | C1 | G1 | 1 | + | Group B | C1 | G2 | 1 | + | Group C | C1 | G3 | 1 | + | Group D | C1 | G4 | 0 | And the following "group members" exist: | user | group | | teacher1 | G1 | @@ -33,6 +38,7 @@ Feature: In a lesson activity, a non editing teacher can grade essay questions | student1 | G1 | | student2 | G2 | | student3 | G3 | + | student4 | G4 | And the following "activities" exist: | activity | name | course | idnumber | | lesson | Test lesson name | C1 | lesson1 | @@ -53,11 +59,19 @@ Feature: In a lesson activity, a non editing teacher can grade essay questions And I am on the "Test lesson name" "lesson activity" page logged in as student2 And I set the field "Your answer" to "

Once upon a time there were two little green frogs." And I press "Submit" + And I am on the "Test lesson name" "lesson activity" page logged in as student4 + And I set the field "Your answer" to "

Once upon a time there were four little green frogs." + And I press "Submit" + And I am on the "Test lesson name" "lesson activity" page logged in as student5 + And I set the field "Your answer" to "

Once upon a time there were five little green frogs." + And I press "Submit" When I am on the "Test lesson name" "lesson activity" page logged in as teacher1 Then I should see "Grade essays" And I grade lesson essays And I should see "Student 1" And I should see "Student 2" + And I should see "Student 4" + And I should see "Student 5" And I should see "Essay question" And I click on "Essay question" "link" in the "Student 1" "table_row" And I should see "Student 1's response" @@ -70,13 +84,20 @@ Feature: In a lesson activity, a non editing teacher can grade essay questions And I select "Group A" from the "Separate groups" singleselect And I should see "Student 1" And I should not see "Student 2" + And I should not see "Student 4" + And I should not see "Student 5" And I select "Group B" from the "Separate groups" singleselect And I should see "Student 2" And I should not see "Student 1" + And I should not see "Student 4" + And I should not see "Student 5" And I select "Group C" from the "Separate groups" singleselect And I should see "No one in Group C has answered an essay question yet." + And I should not see "Group D" in the "Separate groups" "select" And I am on the "Test lesson name" "lesson activity" page logged in as teacher2 Then I should see "Grade essays" And I grade lesson essays And I should not see "Student 1" And I should see "Student 2" + And I should not see "Student 4" + And I should not see "Student 5"