Merge branch 'MDL-42380-master' of git://github.com/damyon/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2013-10-16 15:19:36 +02:00
commit 059d7bd275

View file

@ -901,13 +901,6 @@ class core_course_management_helper_test extends advanced_testcase {
$this->assertEquals('1', $course->visible);
$this->assertEquals('1', $course->visibleold);
// Try with an invalid object.
try {
\core_course\management\helper::action_course_show(get_course($course->id));
} catch (PHPUnit_Framework_Error $exception) {
$this->assertNotEquals(false, strpos($exception->getMessage(), 'must be an instance of course_in_list'));
}
// Revoke the permissions.
$assignment->revoke();
$course = new course_in_list(get_course($course->id));
@ -1296,4 +1289,4 @@ class core_course_management_helper_test extends advanced_testcase {
$CFG->debug = $olddebug;
}
}
}