From cb64dfbeb15537caad2390f36c58bb4b4fc38c7d Mon Sep 17 00:00:00 2001 From: Shamim Rezaie <shamim@moodle.com> Date: Fri, 14 Jun 2019 15:48:52 +1000 Subject: [PATCH] MDL-34411 groups: copy/paste error in test_groups_user_groups_visible --- lib/tests/grouplib_test.php | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/tests/grouplib_test.php b/lib/tests/grouplib_test.php index af350ccdcdb..d63c084ac62 100644 --- a/lib/tests/grouplib_test.php +++ b/lib/tests/grouplib_test.php @@ -1123,7 +1123,7 @@ class core_grouplib_testcase extends advanced_testcase { * Tests for groups_user_groups_visible. */ public function test_groups_user_groups_visible() { - global $CFG, $DB; + global $DB; $generator = $this->getDataGenerator(); $this->resetAfterTest(); @@ -1172,7 +1172,8 @@ class core_grouplib_testcase extends advanced_testcase { $result = groups_user_groups_visible($course, $user2->id); $this->assertTrue($result); - $result = groups_user_groups_visible($course, $user2->id); + $cm->groupmode = NOGROUPS; + $result = groups_user_groups_visible($course, $user2->id, $cm); $this->assertTrue($result); // Cm with no groups. $cm->groupmode = SEPARATEGROUPS; @@ -1190,7 +1191,8 @@ class core_grouplib_testcase extends advanced_testcase { $result = groups_user_groups_visible($course, $user2->id); $this->assertTrue($result); - $result = groups_user_groups_visible($course, $user2->id); + $cm->groupmode = NOGROUPS; + $result = groups_user_groups_visible($course, $user2->id, $cm); $this->assertTrue($result); // Cm with no groups. $cm->groupmode = SEPARATEGROUPS; @@ -1228,7 +1230,7 @@ class core_grouplib_testcase extends advanced_testcase { $this->assertTrue($result); $cm->groupmode = NOGROUPS; - $result = groups_user_groups_visible($course, $user2->id); + $result = groups_user_groups_visible($course, $user2->id, $cm); $this->assertTrue($result); // Cm with no groups. $cm->groupmode = SEPARATEGROUPS; @@ -1296,7 +1298,8 @@ class core_grouplib_testcase extends advanced_testcase { $result = groups_user_groups_visible($course, $user4->id); $this->assertTrue($result); - $result = groups_user_groups_visible($course, $user4->id); + $cm->groupmode = NOGROUPS; + $result = groups_user_groups_visible($course, $user4->id, $cm); $this->assertTrue($result); // Cm with no groups. $cm->groupmode = SEPARATEGROUPS; @@ -1314,7 +1317,8 @@ class core_grouplib_testcase extends advanced_testcase { $result = groups_user_groups_visible($course, $user4->id); $this->assertTrue($result); - $result = groups_user_groups_visible($course, $user4->id); + $cm->groupmode = NOGROUPS; + $result = groups_user_groups_visible($course, $user4->id, $cm); $this->assertTrue($result); // Cm with no groups. $cm->groupmode = SEPARATEGROUPS; @@ -1322,7 +1326,7 @@ class core_grouplib_testcase extends advanced_testcase { $this->assertTrue($result); // Cm with separate groups. $cm->groupmode = SEPARATEGROUPS; - $result = groups_user_groups_visible($course, $user4->id); + $result = groups_user_groups_visible($course, $user4->id, $cm); $this->assertTrue($result); // Cm with visible groups. // Visible groups, forced. @@ -1352,7 +1356,7 @@ class core_grouplib_testcase extends advanced_testcase { $this->assertTrue($result); $cm->groupmode = NOGROUPS; - $result = groups_user_groups_visible($course, $user4->id); + $result = groups_user_groups_visible($course, $user4->id, $cm); $this->assertTrue($result); // Cm with no groups. $cm->groupmode = SEPARATEGROUPS; @@ -1424,7 +1428,8 @@ class core_grouplib_testcase extends advanced_testcase { $result = groups_user_groups_visible($course, $user1->id); $this->assertTrue($result); // Requesting all groups. - $result = groups_user_groups_visible($course, $user1->id); + $cm->groupmode = NOGROUPS; + $result = groups_user_groups_visible($course, $user1->id, $cm); $this->assertTrue($result); // Cm with no groups. $cm->groupmode = SEPARATEGROUPS; @@ -1446,7 +1451,8 @@ class core_grouplib_testcase extends advanced_testcase { $result = groups_user_groups_visible($course, $user1->id); $this->assertTrue($result); // Requesting all groups. - $result = groups_user_groups_visible($course, $user1->id); + $cm->groupmode = NOGROUPS; + $result = groups_user_groups_visible($course, $user1->id, $cm); $this->assertTrue($result); // Cm with no groups. $cm->groupmode = SEPARATEGROUPS; @@ -1456,7 +1462,7 @@ class core_grouplib_testcase extends advanced_testcase { $this->assertTrue($result); // Cm with separate groups. $cm->groupmode = SEPARATEGROUPS; - $result = groups_user_groups_visible($course, $user1->id); + $result = groups_user_groups_visible($course, $user1->id, $cm); $this->assertTrue($result); // Cm with visible groups. // Visible groups, forced. @@ -1492,7 +1498,7 @@ class core_grouplib_testcase extends advanced_testcase { $this->assertTrue($result); // Requesting all groups. $cm->groupmode = NOGROUPS; - $result = groups_user_groups_visible($course, $user1->id); + $result = groups_user_groups_visible($course, $user1->id, $cm); $this->assertTrue($result); // Cm with no groups. $cm->groupmode = SEPARATEGROUPS;