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 #85 - Only remove additionalhtml if in the appropriate settings section.

Browse Source
This commit is contained in:
Daniel Thee Roperto
2016-12-14 11:25:44 +11:00
parent 7946dccd5e
commit 38b1b5fe72
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/phpunit/local/outagelib_test.php
View File

@@ -256,9 +256,7 @@ class outagelib_test extends advanced_testcase {
}
/**
* Check if outagelib::inject() does not inject on admin/settings.php
*
* See Issue #65.
* Check if outagelib::inject() does not inject on admin/settings.php?section=additionalhtml
*/
public function test_inject_settings() {
global $CFG;
@@ -280,6 +278,7 @@ class outagelib_test extends advanced_testcase {
// Pretend we are there...
$_SERVER['SCRIPT_FILENAME'] = '/var/www/alternativepath/admin/settings.php'; // Issue #88 regression test.
$_SERVER['SCRIPT_NAME'] = '/admin/settings.php';
$_GET['section'] = 'additionalhtml';
outagelib::reinject();
self::assertEmpty($CFG->additionalhtmltopofbody);
@@ -525,4 +524,33 @@ EOT;
// This file should not exist even if the statement above fails as Moodle does not create it immediately but test anyway.
self::assertFileNotExists($CFG->dataroot.'/climaintenance.html');
}
/**
* Regression test for issue #85.
*/
public function test_it_can_inject_in_settings_if_not_additional_html() {
global $CFG;
$this->resetAfterTest(true);
self::setAdminUser();
$now = time();
$outage = new outage([
'autostart' => true,
'warntime' => $now,
'starttime' => $now + 100,
'stoptime' => $now + 200,
'title' => 'Title',
'description' => 'Description',
]);
$outage->id = outagedb::save($outage);
self::assertEmpty($CFG->additionalhtmltopofbody);
// Pretend we are there...
$_SERVER['SCRIPT_FILENAME'] = '/var/www/alternativepath/admin/settings.php'; // Issue #88 regression test.
$_SERVER['SCRIPT_NAME'] = '/admin/settings.php';
$_GET['section'] = 'notadditionalhtml';
outagelib::reinject();
self::assertNotEmpty($CFG->additionalhtmltopofbody);
}
}