From e217f4914a1020f7ecd6439b7fa81bf3e49902ce Mon Sep 17 00:00:00 2001 From: Eugene Venter Date: Wed, 16 Dec 2015 17:16:27 +1300 Subject: [PATCH] MDL-52530 unittest: more robust capability assignments for guest for core_files_file_storage_testcase and core_repositorylib_testcase --- lib/filestorage/tests/file_storage_test.php | 4 ++-- repository/tests/repositorylib_test.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/filestorage/tests/file_storage_test.php b/lib/filestorage/tests/file_storage_test.php index 95d60652187..f453f345171 100644 --- a/lib/filestorage/tests/file_storage_test.php +++ b/lib/filestorage/tests/file_storage_test.php @@ -327,8 +327,8 @@ class core_files_file_storage_testcase extends advanced_testcase { $repositorypluginname = 'user'; // Override repository permission. $capability = 'repository/' . $repositorypluginname . ':view'; - $allroles = $DB->get_records_menu('role', array(), 'id', 'archetype, id'); - assign_capability($capability, CAP_ALLOW, $allroles['guest'], $syscontext->id, true); + $guestroleid = $DB->get_field('role', 'id', array('shortname' => 'guest')); + assign_capability($capability, CAP_ALLOW, $guestroleid, $syscontext->id, true); $args = array(); $args['type'] = $repositorypluginname; diff --git a/repository/tests/repositorylib_test.php b/repository/tests/repositorylib_test.php index ac161d1a407..a65c5bb30e6 100644 --- a/repository/tests/repositorylib_test.php +++ b/repository/tests/repositorylib_test.php @@ -44,8 +44,8 @@ class core_repositorylib_testcase extends advanced_testcase { $repositorypluginname = 'boxnet'; // override repository permission $capability = 'repository/' . $repositorypluginname . ':view'; - $allroles = $DB->get_records_menu('role', array(), 'id', 'archetype, id'); - assign_capability($capability, CAP_ALLOW, $allroles['guest'], $syscontext->id, true); + $guestroleid = $DB->get_field('role', 'id', array('shortname' => 'guest')); + assign_capability($capability, CAP_ALLOW, $guestroleid, $syscontext->id, true); $plugintype = new repository_type($repositorypluginname); $pluginid = $plugintype->create(false);