From 4bd53a83f5becf0159feb4ab9577179746ef021b Mon Sep 17 00:00:00 2001 From: Huong Nguyen Date: Thu, 5 Dec 2024 18:31:12 +0800 Subject: [PATCH] MDL-83921 competency: Update unit tests with latest changes --- admin/tool/lp/tests/externallib_test.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/admin/tool/lp/tests/externallib_test.php b/admin/tool/lp/tests/externallib_test.php index db63e158c31..cefd95248c0 100644 --- a/admin/tool/lp/tests/externallib_test.php +++ b/admin/tool/lp/tests/externallib_test.php @@ -141,17 +141,14 @@ class externallib_test extends externallib_advanced_testcase { 'email' => 'bobbyyy@dyyylan.com', 'phone1' => '123456', 'phone2' => '78910', 'department' => 'Marketing', 'institution' => 'HQ')); - // First we search with no capability assigned. + // Assign capability required to perform the search. $this->setUser($ux); - $result = external::search_users('yyylan', 'moodle/competency:planmanage'); - $result = external_api::clean_returnvalue(external::search_users_returns(), $result); - $this->assertCount(0, $result['users']); - $this->assertEquals(0, $result['count']); + $systemcontext = \context_system::instance(); + $customrole = $this->assignUserCapability('moodle/competency:templatemanage', $systemcontext->id); // Now we assign a different capability. $usercontext = \context_user::instance($u1->id); - $systemcontext = \context_system::instance(); - $customrole = $this->assignUserCapability('moodle/competency:planview', $usercontext->id); + $this->assignUserCapability('moodle/competency:templatemanage', $usercontext->id, $customrole); $result = external::search_users('yyylan', 'moodle/competency:planmanage'); $result = external_api::clean_returnvalue(external::search_users_returns(), $result); @@ -187,6 +184,8 @@ class externallib_test extends externallib_advanced_testcase { $ux3 = $dg->create_user(); role_assign($this->creatorrole, $ux3->id, $usercontext->id); $this->setUser($ux3); + $systemcontext = \context_system::instance(); + $customrole = $this->assignUserCapability('moodle/competency:templatemanage', $systemcontext->id, $customrole); $result = external::search_users('yyylan', 'moodle/competency:planmanage'); $result = external_api::clean_returnvalue(external::search_users_returns(), $result); $this->assertCount(1, $result['users']); @@ -262,6 +261,7 @@ class externallib_test extends externallib_advanced_testcase { // Now do the test. $this->setUser($master); + $dummyrole = $this->assignUserCapability('moodle/competency:templatemanage', $syscontext->id); $result = external::search_users('MOODLER', 'moodle/site:config'); $this->assertCount(2, $result['users']); $this->assertEquals(2, $result['count']); @@ -269,6 +269,7 @@ class externallib_test extends externallib_advanced_testcase { $this->assertArrayHasKey($slave3->id, $result['users']); $this->setUser($manager); + $this->assignUserCapability('moodle/competency:templatemanage', $syscontext->id, $dummyrole); $result = external::search_users('MOODLER', 'moodle/site:config'); $this->assertCount(1, $result['users']); $this->assertEquals(1, $result['count']); @@ -377,6 +378,8 @@ class externallib_test extends externallib_advanced_testcase { // Switch to a user that cannot view identity fields. $this->setUser($ux); + $systemcontext = \context_system::instance(); + $this->assignUserCapability('moodle/competency:templatemanage', $systemcontext->id, $dummyrole); $CFG->showuseridentity = 'idnumber,email,phone1,phone2,department,institution'; // Only names are included.