Merge branch 'MDL-40552-master' of git://github.com/danpoltawski/moodle

This commit is contained in:
Sam Hemelryk 2014-12-09 16:13:40 +13:00
commit 44a4b3d072

View File

@ -335,6 +335,8 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
// Enable course completion.
set_config('enablecompletion', 1);
// Enable course themes.
set_config('allowcoursethemes', 1);
// Set the required capabilities by the external function
$contextid = context_system::instance()->id;
@ -415,10 +417,7 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$this->assertEquals($courseinfo->defaultgroupingid, $course2['defaultgroupingid']);
$this->assertEquals($courseinfo->completionnotify, $course2['completionnotify']);
$this->assertEquals($courseinfo->lang, $course2['lang']);
if (!empty($CFG->allowcoursethemes)) {
$this->assertEquals($courseinfo->theme, $course2['forcetheme']);
}
$this->assertEquals($courseinfo->theme, $course2['forcetheme']);
// We enabled completion at the beginning of the test.
$this->assertEquals($courseinfo->enablecompletion, $course2['enablecompletion']);