From 4a9624af2135d94b3de849284be8fcf19c9aac12 Mon Sep 17 00:00:00 2001 From: Davo Smith Date: Thu, 1 Feb 2018 16:48:14 +0000 Subject: [PATCH] MDL-52811 course: fix unit tests broken by setforcedlanguage --- admin/tool/uploadcourse/tests/course_test.php | 2 ++ backup/moodle2/restore_stepslib.php | 2 +- course/tests/externallib_test.php | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/admin/tool/uploadcourse/tests/course_test.php b/admin/tool/uploadcourse/tests/course_test.php index 33561636c7e..1d329fd4972 100644 --- a/admin/tool/uploadcourse/tests/course_test.php +++ b/admin/tool/uploadcourse/tests/course_test.php @@ -266,6 +266,8 @@ class tool_uploadcourse_course_testcase extends advanced_testcase { global $DB; $this->resetAfterTest(true); + cron_setup_user(); // To avoid warnings related to 'moodle/course:setforcedlanguage' capability check. + // Create. $mode = tool_uploadcourse_processor::MODE_CREATE_NEW; $updatemode = tool_uploadcourse_processor::UPDATE_NOTHING; diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php index e0eb1f29177..1814dae2a8e 100644 --- a/backup/moodle2/restore_stepslib.php +++ b/backup/moodle2/restore_stepslib.php @@ -1895,7 +1895,7 @@ class restore_course_structure_step extends restore_structure_step { $data->completionnotify = 0; } $languages = get_string_manager()->get_list_of_translations(); // Get languages for quick search - if (!array_key_exists($data->lang, $languages)) { + if (isset($data->lang) && !array_key_exists($data->lang, $languages)) { $data->lang = ''; } diff --git a/course/tests/externallib_test.php b/course/tests/externallib_test.php index 2b6e4bdb63a..ba36ab0d53f 100644 --- a/course/tests/externallib_test.php +++ b/course/tests/externallib_test.php @@ -412,6 +412,7 @@ class core_course_externallib_testcase extends externallib_advanced_testcase { $contextid = context_system::instance()->id; $roleid = $this->assignUserCapability('moodle/course:create', $contextid); $this->assignUserCapability('moodle/course:visibility', $contextid, $roleid); + $this->assignUserCapability('moodle/course:setforcedlanguage', $contextid, $roleid); $category = self::getDataGenerator()->create_category(); @@ -1129,6 +1130,7 @@ class core_course_externallib_testcase extends externallib_advanced_testcase { $this->assignUserCapability('moodle/course:changesummary', $contextid, $roleid); $this->assignUserCapability('moodle/course:visibility', $contextid, $roleid); $this->assignUserCapability('moodle/course:viewhiddencourses', $contextid, $roleid); + $this->assignUserCapability('moodle/course:setforcedlanguage', $contextid, $roleid); // Create category and course. $category1 = self::getDataGenerator()->create_category(); -- 2.17.1