moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-58340 core_calendar: bailout callback now uses '$cm->uservisible'

Browse source 
Part of MDL-55611 epic.
This commit is contained in:
Mark Nelson 2017-03-21 16:02:56 +08:00 • committed by Damyon Wiese
parent 3fcf13fd75
commit 0c9dc98b44
2 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
calendar/classes/local/event/core_container.php
View file

@ -125,7 +125,7 @@ class core_container {
$cm = $instances[$dbrow->modulename][$dbrow->instance]; $cm = $instances[$dbrow->modulename][$dbrow->instance];
return !(bool)$cm->visible; return !(bool)$cm->uservisible;
}, },
self::$coursecache, self::$coursecache,
self::$modulecache self::$modulecache

41
calendar/tests/core_container_test.php
View file

@ -126,12 +126,12 @@ class core_calendar_container_testcase extends advanced_testcase {
} }
/** /**
* Test that the event factory deals with invisible modules properly. * Test that the event factory deals with invisible modules properly as admin.
* *
* @dataProvider get_event_factory_testcases() * @dataProvider get_event_factory_testcases()
* @param \stdClass $dbrow Row from the "database". * @param \stdClass $dbrow Row from the "database".
*/ */
function test_event_factory_when_module_visibility_is_toggled($dbrow) { function test_event_factory_when_module_visibility_is_toggled_as_admin($dbrow) {
$this->resetAfterTest(true); $this->resetAfterTest(true);
$this->setAdminUser(); $this->setAdminUser();
@ -141,13 +141,48 @@ class core_calendar_container_testcase extends advanced_testcase {
$generator = $this->getDataGenerator()->get_plugin_generator('mod_assign'); $generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
$moduleinstance = $generator->create_instance(['course' => $course->id]); $moduleinstance = $generator->create_instance(['course' => $course->id]);
$dbrow->id = $legacyevent->id;
$dbrow->courseid = $course->id; $dbrow->courseid = $course->id;
$dbrow->instance = $moduleinstance->id; $dbrow->instance = $moduleinstance->id;
$dbrow->modulename = 'assign'; $dbrow->modulename = 'assign';
set_coursemodule_visible($moduleinstance->cmid, 0); set_coursemodule_visible($moduleinstance->cmid, 0);
$event = $factory->create_instance($dbrow); $event = $factory->create_instance($dbrow);
// Module is invisible, factory should not produce an event.
// Test that the factory is returning an event as the admin can see hidden course modules.
$this->assertInstanceOf(event_interface::class, $event);
}
/**
* Test that the event factory deals with invisible modules properly as a guest.
*
* @dataProvider get_event_factory_testcases()
* @param \stdClass $dbrow Row from the "database".
*/
function test_event_factory_when_module_visibility_is_toggled_as_guest($dbrow) {
$this->resetAfterTest(true);
$this->setAdminUser();
$legacyevent = $this->create_event($dbrow);
$factory = \core_calendar\local\event\core_container::get_event_factory();
$course = $this->getDataGenerator()->create_course();
$generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
$moduleinstance = $generator->create_instance(['course' => $course->id]);
$dbrow->id = $legacyevent->id;
$dbrow->courseid = $course->id;
$dbrow->instance = $moduleinstance->id;
$dbrow->modulename = 'assign';
set_coursemodule_visible($moduleinstance->cmid, 0);
// Set to a user who can not view hidden course modules.
$this->setGuestUser();
$event = $factory->create_instance($dbrow);
// Module is invisible to guest users so this should return null.
$this->assertNull($event); $this->assertNull($event);
} }