mirror/moodle-auth_outage
1
0
Fork 0
mirror of https://github.com/catalyst/moodle-auth_outage.git synced 2026-05-16 21:41:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue #64 - Fixed problems detected by Behat test.

Browse Source
This commit is contained in:
Daniel Thee Roperto
2016-10-19 10:30:26 +11:00
parent 6985d33dc6
commit 38dbb6deaa
5 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/calendar/calendar.php
View File

@@ -96,9 +96,9 @@ class calendar {
'courseid' => 1,
'groupid' => 0,
'userid' => 0,
'modulename' => 'auth_outage',
'modulename' => '',
'instance' => $outage->id,
'eventtype' => 'outage',
'eventtype' => 'auth_outage',
'timestart' => $outage->starttime,
'visible' => true,
'timeduration' => $outage->get_duration_planned(),
@@ -115,7 +115,7 @@ class calendar {
$event = $DB->get_record_select(
'event',
"(modulename='auth_outage' AND eventtype='outage' AND instance = :outageid)",
"(eventtype = 'auth_outage' AND instance = :outageid)",
['outageid' => $outageid],
'id',
IGNORE_MISSING

5
db/uninstall.php
View File

@@ -31,6 +31,11 @@ defined('MOODLE_INTERNAL') || die();
*/
function xmldb_auth_outage_uninstall() {
global $DB;
// Delete all outage events.
$DB->delete_records('event', ['eventtype' => 'auth_outage']);
// Delete template file.
$template = auth_outage\local\controllers\infopage::get_defaulttemplatefile();
if (file_exists($template)) {

4
tests/phpunit/calendar/calendar_test.php
View File

@@ -130,8 +130,8 @@ class calendar_test extends advanced_testcase {
$calendar = calendar::load(self::$outage->id);
self::assertSame(self::$outage->title, $calendar->name);
self::assertSame(self::$outage->description, $calendar->description);
self::assertSame('outage', $calendar->eventtype);
self::assertSame('auth_outage', $calendar->modulename);
self::assertSame('auth_outage', $calendar->eventtype);
self::assertSame('', $calendar->modulename);
self::assertEquals(self::$outage->starttime, $calendar->timestart);
self::assertEquals(self::$outage->get_duration_planned(), $calendar->timeduration);
}

6
tests/phpunit/event/events_test.php
View File

@@ -75,7 +75,7 @@ class events_test extends advanced_testcase {
// Check existance.
self::$event = $DB->get_record_select(
'event',
"(modulename='auth_outage' AND eventtype='outage' AND instance=:idoutage)",
"(eventtype = 'auth_outage' AND instance = :idoutage)",
['idoutage' => self::$outage->id],
'id',
IGNORE_MISSING
@@ -98,7 +98,7 @@ class events_test extends advanced_testcase {
// Should still exist.
$event = $DB->get_record_select(
'event',
"(modulename='auth_outage' AND eventtype='outage' AND instance=:idoutage)",
"(eventtype = 'auth_outage' AND instance = :idoutage)",
['idoutage' => self::$outage->id],
'id',
IGNORE_MISSING
@@ -122,7 +122,7 @@ class events_test extends advanced_testcase {
// Should not exist.
$event = $DB->get_record_select(
'event',
"(modulename='auth_outage' AND eventtype='outage' AND instance=:idoutage) OR (id = :idevent)",
"(eventtype = 'auth_outage' AND instance = :idoutage) OR (id = :idevent)",
['idoutage' => self::$outage->id, 'idevent' => self::$event->id],
'id',
IGNORE_MISSING

2
tests/phpunit/installation_test.php
View File

@@ -64,7 +64,7 @@ class installation_test extends auth_outage_base_testcase {
'description' => 'Description',
]);
\auth_outage\dml\outagedb::save($outage);
self::assertSame(1, $DB->count_records_select('event', "modulename='auth_outage'", null));
self::assertSame(1, $DB->count_records_select('event', "eventtype = 'auth_outage'", null));
// Uninstall plugin.
require_once($CFG->libdir.'/adminlib.php');