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

Merge branch 'MDL-45765-moodle26' of https://github.com/StudiUM/moodle into MOODLE_26_STABLE

Browse source
This commit is contained in:
Sam Hemelryk 2014-07-14 12:10:03 +12:00
commit 4a8103d97b
2 changed files with 54 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
calendar/lib.php
View file

@ -3168,10 +3168,10 @@ function calendar_cron() {
mtrace("Updating calendar subscription {$sub->name} in course {$sub->courseid}"); mtrace("Updating calendar subscription {$sub->name} in course {$sub->courseid}");
try { try {
$log = calendar_update_subscription_events($sub->id); $log = calendar_update_subscription_events($sub->id);
mtrace(trim(strip_tags($log)));
} catch (moodle_exception $ex) { } catch (moodle_exception $ex) {
mtrace('Error updating calendar subscription: ' . $ex->getMessage());
} }
mtrace(trim(strip_tags($log)));
} }
mtrace('Finished updating calendar subscriptions.'); mtrace('Finished updating calendar subscriptions.');

53
calendar/tests/lib_test.php
View file

@ -35,9 +35,11 @@ require_once($CFG->dirroot . '/calendar/lib.php');
*/ */
class core_calendar_lib_testcase extends advanced_testcase { class core_calendar_lib_testcase extends advanced_testcase {
public function test_calendar_get_course_cached() { protected function setUp() {
$this->resetAfterTest(true); $this->resetAfterTest(true);
}
public function test_calendar_get_course_cached() {
// Setup some test courses. // Setup some test courses.
$course1 = $this->getDataGenerator()->create_course(); $course1 = $this->getDataGenerator()->create_course();
$course2 = $this->getDataGenerator()->create_course(); $course2 = $this->getDataGenerator()->create_course();
@ -68,4 +70,53 @@ class core_calendar_lib_testcase extends advanced_testcase {
$this->assertEquals($course3->shortname, $cachedcourse3->shortname); $this->assertEquals($course3->shortname, $cachedcourse3->shortname);
$this->assertEquals($course3->fullname, $cachedcourse3->fullname); $this->assertEquals($course3->fullname, $cachedcourse3->fullname);
} }
/**
* Test calendar cron with a working subscription URL.
*/
public function test_calendar_cron_working_url() {
global $CFG;
require_once($CFG->dirroot . '/lib/cronlib.php');
// Moodle ICal URL (moodle.org events).
$presetwhat = 'all';
$presettime = 'recentupcoming';
$userid = 1;
$authtoken = 'a8bcfee2fb868a05357f650bd65dc0699b026524';
$subscriptionurl = 'https://moodle.org/calendar/export_execute.php'
. '?preset_what='.$presetwhat.'&preset_time='.$presettime.'&userid='.$userid.'&authtoken='.$authtoken;
$subscription = new stdClass();
$subscription->eventtype = 'site';
$subscription->name = 'test';
$subscription->url = $subscriptionurl;
$subscription->pollinterval = 86400;
$subscription->lastupdated = 0;
calendar_add_subscription($subscription);
$this->expectOutputRegex('/Events imported: .* Events updated:/');
calendar_cron();
// Clear the time limit, otherwise PHPUnit complains.
set_time_limit(0);
}
/**
* Test calendar cron with a broken subscription URL.
*/
public function test_calendar_cron_broken_url() {
global $CFG;
require_once($CFG->dirroot . '/lib/cronlib.php');
$subscription = new stdClass();
$subscription->eventtype = 'site';
$subscription->name = 'test';
$subscription->url = 'brokenurl';
$subscription->pollinterval = 86400;
$subscription->lastupdated = 0;
calendar_add_subscription($subscription);
$this->expectOutputRegex('/Error updating calendar subscription: The given iCal URL is invalid/');
calendar_cron();
}
} }