Merge branch 'MDL-72060-master' of git://github.com/lameze/moodle

moodle · Sep 28, 2021 · 7d14aa2 · 7d14aa2
2 parents 6ca7e31 + 55f6ff7
commit 7d14aa2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/mod/lti/service/gradebookservices/classes/local/service/gradebookservices.php b/mod/lti/service/gradebookservices/classes/local/service/gradebookservices.php
@@ -721,7 +721,7 @@ public static function is_user_gradable_in_course($courseid, $userid) {
             $gradebookroles = explode(',', $CFG->gradebookroles);
             foreach ($roles as $role) {
                 foreach ($gradebookroles as $gradebookrole) {
-                    if ($role->roleid = $gradebookrole) {
+                    if ($role->roleid === $gradebookrole) {
                         $gradableuser = true;
                     }
                 }

diff --git a/mod/lti/service/gradebookservices/tests/gradebookservices_test.php b/mod/lti/service/gradebookservices/tests/gradebookservices_test.php
@@ -150,6 +150,23 @@ public function test_get_launch_parameters_decoupled() {
         $this->assertFalse(array_key_exists('$LineItem.url', $params));
     }
 
+    /**
+     * Test if a user can be graded in a course.
+     */
+    public function test_is_user_gradable_in_course() {
+        $this->resetAfterTest();
+
+        $generator = $this->getDataGenerator();
+        $course = $generator->create_course();
+        $user1 = $generator->create_user();
+        $user2 = $generator->create_user();
+        $generator->enrol_user($user1->id, $course->id, 'student');
+        $generator->enrol_user($user2->id, $course->id, 'editingteacher');
+
+        $this->assertTrue(gradebookservices::is_user_gradable_in_course($course->id, $user1->id));
+        $this->assertFalse(gradebookservices::is_user_gradable_in_course($course->id, $user2->id));
+    }
+
     /**
      * Asserts a matching gradebookservices record exist with the matching tag and resourceid.
      *