WR#334284 fixing unit tests

Improve shared caching of the checkfinished endpoint #231

.travis.yml

@@ -1,7 +1,5 @@
 language: php
 
-sudo: true
-
 services:
   - mysql
 
@@ -30,16 +28,18 @@ env:
 
 matrix:
   include:
-    - php: 5.6
-      env: DB=pgsql  MOODLE_BRANCH=MOODLE_33_STABLE NODEJS=8
     - php: 7.0
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
-    - php: 7.1
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE NODEJS=8
+      env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
+    - php: 7.0
+      env: DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE NODEJS=8
+    - php: 7.2
+      env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
+    - php: 7.2
+      env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
     - php: 7.4
-      env: DB=mysqli MOODLE_BRANCH=master
-    - php: 7.4
-      env: DB=pgsql MOODLE_BRANCH=master
+      env: DB=pgsql MOODLE_BRANCH=MOODLE_39_STABLE
+    - php: 7.2
+      env: DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE
 
 before_install:
   - export MOODLE_VERSION=$(echo "$MOODLE_BRANCH" | cut -d'_' -f 2)
@@ -53,7 +53,7 @@ before_install:
     fi
   - cd ../..
   - composer selfupdate
-  - composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2
+  - composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3;
   - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
 
 install:

auth.php

@@ -66,11 +66,4 @@ class auth_plugin_outage extends auth_plugin_base {
     public function user_login($username, $password) {
         return false;
     }
-
-    /**
-     * Login page hook.
-     */
-    public function loginpage_hook() {
-        outagelib::inject();
-    }
 }

checkfinished.php

@@ -25,6 +25,9 @@
 
 use auth_outage\dml\outagedb;
 
+define('NO_MOODLE_COOKIES', true);
+header('Cache-Control: public, max-age=10,s-maxage=10');
+
 require_once(__DIR__.'/../../config.php');
 
 $active = outagedb::get_active();

classes/dml/outagedb.php

@@ -96,79 +96,6 @@ class outagedb {
         return new outage($outage);
     }
 
-    /**
-     * Also sends all admins the event as a message
-     *
-     * @param $outage
-     * @param $event
-     */
-    private static function notify($outage, $event) {
-
-        $admins = get_admins();
-
-        foreach ($admins as $admin) {
-            self::notify_user($outage, $event, $admin);
-        }
-
-    }
-
-    /**
-     * Send outage info to one user
-     *
-     * @param $outage outage
-     * @param $event event
-     * @param $to user object
-     */
-    private static function notify_user($outage, $event, $to) {
-
-        global $SITE, $CFG;
-
-        $from = \core_user::get_user($event->userid);
-        $fields = [
-            'site_shortname'    => $SITE->shortname,
-            'site_fullname'     => $SITE->fullname,
-            'site_wwwroot'      => $CFG->wwwroot,
-
-            'outage_id'         => $outage->id,
-            'outage_title'      => $outage->get_title(),
-            'outage_desc'       => $outage->get_description(),
-            'outage_start'      => userdate($outage->starttime, get_string('datetimeformat', 'auth_outage')),
-            'outage_stop'       => userdate($outage->stoptime, get_string('datetimeformat', 'auth_outage')),
-            'outage_duration'   => format_time($outage->get_duration_planned()),
-
-            'event_name'        => $event->get_name(),
-            'event_desc'        => $event->get_description(),
-            'event_link'        => $event->get_url()->out(),
-
-            'from_name'         => fullname($from),
-            'to_name'           => fullname($to),
-            'prefs_link'        => (new \moodle_url('/message/notificationpreferences.php'))->out(),
-
-        ];
-
-        $message = new \core\message\message();
-        $message->component = 'auth_outage';
-        $message->name = 'updatenotify';
-        $message->userto = $to;
-        $message->subject         = get_string('messagesubject', 'auth_outage', $fields);
-        $message->fullmessage     = get_string('messagetext',    'auth_outage', $fields);
-        $message->fullmessagehtml = get_string('messagehtml',    'auth_outage', $fields);
-        $message->fullmessageformat = FORMAT_HTML;
-
-        $threadid = generate_email_messageid('outage' . $outage->id);
-        $message->userfrom = $from;
-        $message->userfrom->customheaders = [
-            "In-Reply-To: $threadid",
-            "References: $threadid",
-            "Thread-Topic: " . $message->subject,
-            "Thread-Index: $threadid",
-        ];
-
-        $message->notification = '1';
-        $messageid = message_send($message);
-
-    }
-
     /**
      * Saves an outage to the database.
      *
@@ -199,7 +126,6 @@ class outagedb {
             ]);
             $event->add_record_snapshot('auth_outage', (object)(array) $outage);
             $event->trigger();
-            self::notify($outage, $event);
 
             // Create calendar entry.
             calendar::create($outage);
@@ -214,7 +140,6 @@ class outagedb {
 
             $event->add_record_snapshot('auth_outage', (object)(array) $outage);
             $event->trigger();
-            self::notify($outage, $event);
 
             // Remove the createdby field so it does not get updated.
             unset($outage->createdby);
@@ -258,7 +183,6 @@ class outagedb {
 
         $event->add_record_snapshot('auth_outage', $previous);
         $event->trigger();
-        self::notify($outage, $event);
 
         // Delete it and remove from calendar.
         $DB->delete_records('auth_outage', ['id' => $id]);

classes/event/outage_created.php

@@ -39,23 +39,13 @@ defined('MOODLE_INTERNAL') || die();
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class outage_created extends base {
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('eventoutagecreated', 'auth_outage');
-    }
-
     /**
      * Returns non-localised event description with id's for admin use only.
      *
      * @return string
      */
     public function get_description() {
-        return "The user with the id '{$this->userid}' scheduled outage {$this->other['id']} '{$this->other['title']}'";
+        return "The user with the id '{$this->userid}' created outage {$this->other['id']} '{$this->other['title']}'";
     }
 
     /**

classes/event/outage_deleted.php

@@ -38,16 +38,6 @@ defined('MOODLE_INTERNAL') || die();
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class outage_deleted extends base {
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('eventoutagedeleted', 'auth_outage');
-    }
-
     /**
      * Returns non-localised event description with id's for admin use only.
      *

classes/event/outage_updated.php

@@ -39,16 +39,6 @@ defined('MOODLE_INTERNAL') || die();
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class outage_updated extends base {
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('eventoutageupdated', 'auth_outage');
-    }
-
     /**
      * Returns non-localised event description with id's for admin use only.
      *

classes/local/cli/clibase.php

@@ -102,6 +102,15 @@ abstract class clibase {
         $this->time = $time;
     }
 
+    /**
+     * Gets the reference time for creating outages.
+     */
+    public function get_referencetime()
+    {
+        return $this->time;
+    }
+
+
     /**
      * Generates all options (parameters) available for the CLI command.
      * @return mixed[] Options.

classes/local/controllers/infopage.php

@@ -108,7 +108,7 @@ class infopage {
         $PAGE->set_url(new moodle_url('/auth/outage/info.php'));
 
         // No hooks injecting into this page, do it manually.
-        outagelib::inject();
+        echo outagelib::get_inject_code();
 
         echo $OUTPUT->header();
         $viewbag = [

classes/local/controllers/maintenance_static_page_io.php

@@ -44,11 +44,13 @@ defined('MOODLE_INTERNAL') || die();
 class maintenance_static_page_io {
     /**
      * Checks if the given string starts with "http://" or "https://".
+     * Also checks for "//" at the start of image, which setting_file_url still uses.
+     *
      * @param $url
      * @return bool
      */
     public static function is_url($url) {
-        return (bool)preg_match('#^http(s)?://#', $url);
+        return ((bool) preg_match('#^http(s)?://#', $url) || (bool) preg_match('#^//#', $url));
     }
 
     /**

classes/local/outagelib.php

@@ -71,11 +71,10 @@ class outagelib {
     }
 
     /**
-     * Calls inject even if it was already called before.
+     * Resets inject called to allow the code to be regenerated.
      */
-    public static function reinject() {
+    public static function reset_injectcalled() {
         self::$injectcalled = false;
-        self::inject();
     }
 
     /**
@@ -99,11 +98,12 @@ class outagelib {
 
 
     /**
-     * Will check for ongoing or warning outages and will attach the message bar as required.
+     * Will check for ongoing or warning outages and will return the message bar as required.
+     *
+     * @return string|void CSS and HTML for the warning bar if it should be displayed
      */
-    public static function inject() {
-        global $CFG;
-
+    public static function get_inject_code() {
+        global $PAGE;
         // Ensure we do not kill the whole website in case of an error.
         try {
             // Check if we should inject the code.
@@ -111,8 +111,6 @@ class outagelib {
                 return;
             }
 
-            self::clean_outages();
-
             // Check for a previewing outage, then for an active outage.
             $previewid = optional_param('auth_outage_preview', null, PARAM_INT);
             $time = time();
@@ -135,8 +133,8 @@ class outagelib {
             }
 
             // There is a previewing or active outage.
-            $CFG->additionalhtmltopofbody = renderer::get()->render_warningbar($active, $time, false, $preview).
-                                            $CFG->additionalhtmltopofbody;
+            $renderer = $PAGE->get_renderer('auth_outage');
+            return $renderer->render_warningbar($active, $time, false, $preview);
         } catch (Exception $e) {
             debugging('Exception occured while injecting our code: '.$e->getMessage());
             debugging($e->getTraceAsString(), DEBUG_DEVELOPER);
@@ -396,26 +394,4 @@ EOT;
 
         return $message;
     }
-
-    /**
-     * Checks $CFG->additionalhtmltopofbody for saved outages and removes them.
-     * We should only be temporarily injecting into that variable and not saving them to the database.
-     *
-     * @return string the cleaned content
-     */
-    public static function clean_outages() {
-        global $CFG;
-
-        // Replace the content to clean up pages that do not have the injection.
-        $re = '/' . self::OUTAGE_START . '[\s\S]*' . self::OUTAGE_END . '/m';
-        $replaced = preg_replace($re, '', $CFG->additionalhtmltopofbody);
-
-        // We have removed the outages and any duplicates as it should be injected and not saved to $CFG.
-        if ($CFG->additionalhtmltopofbody != $replaced) {
-            set_config('additionalhtmltopofbody', $replaced);
-            return $replaced;
-        }
-
-        return '';
-    }
 }

classes/output/renderer.php

@@ -44,15 +44,6 @@ defined('MOODLE_INTERNAL') || die();
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class renderer extends plugin_renderer_base {
-    /**
-     * Returns the outage renderer.
-     * @return renderer The outage renderer.
-     */
-    public static function get() {
-        global $PAGE;
-        return $PAGE->get_renderer('auth_outage');
-    }
-
     /**
      * Outputs the view in a separate scope to avoid conflicts with variable names.
      * @param string $view View PHP file.
@@ -154,8 +145,6 @@ class renderer extends plugin_renderer_base {
      * @return string The formatted HTML.
      */
     private function renderoutage(outage $outage, $buttons) {
-        global $OUTPUT;
-
         if ($outage->createdby == 0) {
             $created = get_string('na', 'auth_outage');
         } else {
@@ -179,14 +168,14 @@ class renderer extends plugin_renderer_base {
         $url = new moodle_url('/auth/outage/edit.php', ['edit' => $outage->id]);
         $img = html_writer::empty_tag(
             'img',
-            ['src' => $OUTPUT->image_url('t/edit'), 'alt' => get_string('edit'), 'class' => 'iconsmall']
+            ['src' => $this->output->image_url('t/edit'), 'alt' => get_string('edit'), 'class' => 'iconsmall']
         );
         $linkedit = html_writer::link($url, $img, ['title' => get_string('edit')]);
 
         $url = new moodle_url('/auth/outage/delete.php', ['id' => $outage->id]);
         $img = html_writer::empty_tag(
             'img',
-            ['src' => $OUTPUT->image_url('t/delete'), 'alt' => get_string('delete'), 'class' => 'iconsmall']
+            ['src' => $this->output->image_url('t/delete'), 'alt' => get_string('delete'), 'class' => 'iconsmall']
         );
         $linkdelete = html_writer::link($url, $img, ['title' => get_string('delete')]);
 

db/access.php

@@ -1,37 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Defines capabilities
- *
- * @package    auth_outage
- * @copyright  2020 Brendan Heywood <brendan@catalyst-au.net>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-$capabilities = [
-    'auth/outage:updatenotify' => [
-        'captype'       => 'write',
-        'riskbitmask'   => RISK_XSS,
-        'contextlevel'  => CONTEXT_SYSTEM,
-        'archetypes'    => [
-            'manager'   => CAP_ALLOW,
-        ]
-    ],
-];
-

db/messages.php

@@ -1,32 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Defines message providers for outage
- *
- * @package    auth_outage
- * @copyright  2020 Brendan Heywood <brendan@catalyst-au.net>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-$messageproviders = [
-    'updatenotify' => [
-        'capability'  => 'auth/outage:updatenotify',
-    ]
-];
-

delete.php

@@ -33,6 +33,7 @@ require_once($CFG->libdir.'/formslib.php');
 
 admin_externalpage_setup('auth_outage_manage');
 $PAGE->set_url(new moodle_url('/auth/outage/manage.php'));
+$output = $PAGE->get_renderer('auth_outage');
 
 $mform = new delete();
 if ($mform->is_cancelled()) {
@@ -52,10 +53,10 @@ $dataid = new stdClass();
 $dataid->id = $outage->id;
 $mform->set_data($dataid);
 
-echo $OUTPUT->header();
+echo $output->header();
 
-echo renderer::get()->renderdeleteconfirmation($outage);
+echo $output->renderdeleteconfirmation($outage);
 
 $mform->display();
 
-echo $OUTPUT->footer();
+echo $output->footer();

edit.php

@@ -34,6 +34,7 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/formslib.php');
 
 admin_externalpage_setup('auth_outage_manage');
+$output = $PAGE->get_renderer('auth_outage');
 $PAGE->set_url(new moodle_url('/auth/outage/manage.php'));
 
 $mform = new edit();
@@ -83,7 +84,7 @@ if ($outage == null) {
 $mform->set_data($outage);
 
 $PAGE->navbar->add(get_string($action.'crumb', 'auth_outage'));
-echo $OUTPUT->header();
-echo renderer::get()->rendersubtitle($action);
+echo $output->header();
+echo $output->rendersubtitle($action);
 $mform->display();
-echo $OUTPUT->footer();
+echo $output->footer();

finish.php

@@ -33,6 +33,7 @@ require_once($CFG->libdir.'/formslib.php');
 
 admin_externalpage_setup('auth_outage_manage');
 $PAGE->set_url(new moodle_url('/auth/outage/manage.php'));
+$output = $PAGE->get_renderer('auth_outage');
 
 $mform = new finish();
 if ($mform->is_cancelled()) {
@@ -52,10 +53,10 @@ $dataid = new stdClass();
 $dataid->id = $outage->id;
 $mform->set_data($dataid);
 
-echo $OUTPUT->header();
+echo $output->header();
 
-echo renderer::get()->renderfinishconfirmation($outage);
+echo $output->renderfinishconfirmation($outage);
 
 $mform->display();
 
-echo $OUTPUT->footer();
+echo $output->footer();

lang/en/auth_outage.php

@@ -90,9 +90,6 @@ $string['defaultdescriptiondescription'] = 'Default warning message for outages.
 $string['defaultdescriptionvalue'] = 'There is an scheduled maintenance from {{start}} to {{stop}} and our system will not be available during that time.';
 $string['description'] = 'Public Description';
 $string['description_help'] = 'A full description of the outage, publicly visible by all users.';
-$string['eventoutagecreated'] = 'Outage scheduled';
-$string['eventoutagedeleted'] = 'Outage cancelled';
-$string['eventoutageupdated'] = 'Outage updated';
 $string['finish'] = 'Finish';
 $string['info15secondsbefore'] = '15 seconds before';
 $string['infoendofoutage'] = 'end of outage';
@@ -113,45 +110,6 @@ $string['messageoutagebackonline'] = 'We are back online!';
 $string['messageoutagebackonlinedescription'] = 'You may resume browsing safely.';
 $string['messageoutageongoing'] = 'Back online at {$a->stop}.';
 $string['messageoutagewarning'] = 'Shutting down in {{countdown}}';
-$string['messageprovider:updatenotify'] = 'Changes to planned outages';
-$string['messagesubject'] = '[{$a->site_shortname}] {$a->event_name} #{$a->outage_id}: {$a->outage_start}';
-$string['messagetext'] = '{$a->event_name}
-
-{$a->site_fullname} ({$a->site_wwwroot})
-
-{$a->event_link}
-
-ID: {$a->outage_id}
-NAME: {$a->outage_title}
-START: {$a->outage_start}
-DURATION: {$a->outage_duration}
-DESCRIPTION:
-{$a->outage_desc}
-
---
-
-To unsubscribe visit:
-{$a->prefs_link}';
-$string['messagehtml'] = '
-<h3>{$a->event_name}</h3>
-
-<p>{$a->site_fullname} (<a href="{$a->site_wwwroot}">{$a->site_wwwroot}</a>)</p>
-
-<p><a href="{$a->event_link}">{$a->event_link}</a></p>
-
-<h4>Name:</h4>
-<p>{$a->outage_title}</p>
-<h4>Start:</h4>
-<p>{$a->outage_start}</p>
-<h4>Duration:</h4>
-<p>{$a->outage_duration}</p>
-<h4>Description:</h4>
-<p>{$a->outage_desc}</p>
-
-<hr>
-<p>To unsubscribe visit:<br>
-<a href="{$a->prefs_link}">{$a->prefs_link}</a></p>
-';
 $string['na'] = 'n/a';
 $string['notfound'] = 'No outages found.';
 $string['outageedit'] = 'Edit outage';

lib.php

@@ -27,27 +27,6 @@ use auth_outage\local\outagelib;
 
 defined('MOODLE_INTERNAL') || die;
 
-/**
- * Used in Moodle 30+ when a user is logged on.
- */
-function auth_outage_extend_navigation_user_settings() {
-    outagelib::inject();
-}
-
-/**
- * Used in Moodle 30+ on the frontpage.
- */
-function auth_outage_extend_navigation_frontpage() {
-    outagelib::inject();
-}
-
-/**
- * Used in Moodle 31+ when a user is logged on.
- */
-function auth_outage_extend_navigation_user() {
-    outagelib::inject();
-}
-
 /**
  * Used for adminlib::set_updatedcallback which requires a string that resolves to a function.
  *
@@ -98,3 +77,13 @@ function auth_outage_get_fontawesome_icon_map() {
         'core:i/auth_outageevent' => 'fa-power-off',
     ];
 }
+
+/**
+ * Inject the warning bar into the page if there is currently an outage.
+ *
+ * @return string|void
+ */
+function auth_outage_before_standard_top_of_body_html() {
+    // Get code to inject.
+    return outagelib::get_inject_code();
+}

manage.php

@@ -32,16 +32,17 @@ require_once($CFG->libdir.'/adminlib.php');
 
 admin_externalpage_setup('auth_outage_manage');
 $PAGE->set_url(new moodle_url('/auth/outage/manage.php'));
+$output = $PAGE->get_renderer('auth_outage');
 
-echo $OUTPUT->header();
+echo $output->header();
 
 // Give it a consistent time so all outages are listed. Useful when debugging.
 $now = time();
 
-renderer::get()->output_view('manage.php', [
+$output->output_view('manage.php', [
     'unended' => outagedb::get_all_unended($now),
     'ended'   => outagedb::get_all_ended($now),
     'warning' => outagelib::generate_plugin_configuration_warning(),
 ]);
 
-echo $OUTPUT->footer();
+echo $output->footer();

tests/phpunit/dml/outagedb_test.php

@@ -95,6 +95,8 @@ class outagedb_test extends auth_outage_base_testcase {
         $outage = $this->createoutage(2);
         $outage->id = $id;
         outagedb::save($outage);
+        // Ensure an id was given.
+        self::assertNotEquals(0, $id);
     }
 
     /**

tests/phpunit/form/forms_test.php

@@ -44,14 +44,16 @@ class forms_test extends auth_outage_base_testcase {
      * Create a delete form.
      */
     public function test_delete() {
-        new delete();
+        $form = new delete();
+        self::assertNotNull($form);
     }
 
     /**
      * Create a finish form.
      */
     public function test_finish() {
-        new finish();
+        $form = new finish();
+        self::assertNotNull($form);
     }
 
     /**
@@ -164,6 +166,7 @@ class forms_test extends auth_outage_base_testcase {
         ]);
         $edit = new edit();
         $edit->set_data($outage);
+        self::assertTrue(true, "set_data did not return any error");
     }
 
     /**

tests/phpunit/local/cli/cli_test.php

@@ -61,8 +61,12 @@ class cli_test extends auth_outage_cli_testcase {
      */
     public function test_setreferencetime() {
         $cli = new create(['start' => 0]);
+
         $cli->set_referencetime(1);
+        self::assertEquals(1, $cli->get_referencetime());
+
         $cli->set_referencetime(60 * 60 * 24 * 7);
+        self::assertEquals(604800, $cli->get_referencetime());
     }
 
     /**

tests/phpunit/local/cli/finish_test.php

@@ -121,10 +121,16 @@ class finish_test extends auth_outage_cli_testcase {
             'title' => 'Title',
             'description' => 'Description',
         ]));
+        $outage = outagedb::get_by_id($id);
+        self::assertNull($outage->finished, "outage should not be finished");
+
         $this->set_parameters(['-id='.$id]);
         $cli = new finish();
         $cli->set_referencetime($now);
         $this->execute($cli);
+
+        $outage = outagedb::get_by_id($id);
+        self::assertNotNull($outage->finished, "outage should be finished");
     }
 
     /**

tests/phpunit/local/controllers/infopage_test.php

@@ -43,7 +43,8 @@ class infopagecontroller_test extends auth_outage_base_testcase {
      * Tests the constructor.
      */
     public function test_constructor() {
-        new infopage();
+        $infopage = new infopage();
+        self::assertNotNull($infopage);
     }
 
     /**
@@ -51,7 +52,8 @@ class infopagecontroller_test extends auth_outage_base_testcase {
      */
     public function test_constructor_withparams() {
         $_GET = ['id' => 1, 'static' => 'true'];
-        new infopage();
+        $infopage = new infopage();
+        self::assertNotNull($infopage);
     }
 
     /**

tests/phpunit/local/controllers/maintenance_static_page_test.php

@@ -60,7 +60,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
     }
 
     public function test_createfromoutage() {
-        // How to fetch a page from PHPUnit environment?
+        self::markTestSkipped("How to fetch a page from PHPUnit environment?");
     }
 
     public function test_createfromhtml() {
@@ -260,11 +260,22 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
         self::assertContains('www.example.com/moodle/auth/outage/file.php?file=img.png', $io->get_url_for_file('img.png'));
     }
 
-    public function test_is_url() {
-        self::assertTrue(maintenance_static_page_io::is_url('http://catalyst.net.nz'));
-        self::assertTrue(maintenance_static_page_io::is_url('https://www.catalyst-au.net/'));
-        self::assertFalse(maintenance_static_page_io::is_url('/homepage'));
-        self::assertFalse(maintenance_static_page_io::is_url('file://homepage'));
+    public function is_url_dataprovider() {
+        return [
+            [true, 'http://catalyst.net.nz'],
+            [true, 'https://www.catalyst-au.net/'],
+            [false, '/homepage'],
+            [false, 'file://homepage'],
+            [true, '//catalyst-au.net/img/test.jpg'],
+            [false, '://www.catalyst-au.net/img/test.jpg']
+        ];
+    }
+
+    /**
+     * @dataProvider is_url_dataprovider
+     */
+    public function test_is_url($result, $url) {
+        self::assertEquals($result, maintenance_static_page_io::is_url($url));
     }
 
     public function test_file_get_data() {
@@ -392,7 +403,6 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
         $page->set_max_refresh_time(5);
         $page->generate();
         $generated = trim(file_get_contents($page->get_io()->get_template_file()));
-        return $generated;
 
         self::assertContains('<meta http-equiv="refresh" content="5">', $generated);
     }
@@ -401,7 +411,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
      * Data provider for test_get_urls_from_stylesheet
      * @return array
      */
-    public function test_get_urls_from_stylesheet_provider() {
+    public function get_urls_from_stylesheet_provider() {
         return [
             // Empty string.
             ["", 0],
@@ -423,7 +433,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
     /**
      * Tests get_urls_from_stylesheet() method to get all appropriate URLS from the file.
      *
-     * @dataProvider test_get_urls_from_stylesheet_provider
+     * @dataProvider get_urls_from_stylesheet_provider
      * @param string $filecontent Content of the file
      * @param int $count Expected quantity of found URLs
      * @throws coding_exception

tests/phpunit/local/outagelib_test.php

@@ -82,7 +82,7 @@ class outagelib_test extends auth_outage_base_testcase {
      * Check outagelib::inject() works as expected.
      */
     public function test_inject() {
-        global $CFG;
+        global $OUTPUT;
 
         $this->resetAfterTest(true);
         self::setAdminUser();
@@ -96,16 +96,15 @@ class outagelib_test extends auth_outage_base_testcase {
             'description' => 'Description',
         ]);
         $outage->id = outagedb::save($outage);
-        self::assertEmpty($CFG->additionalhtmltopofbody);
 
-        outagelib::reinject();
-        self::assertContains('<style>', $CFG->additionalhtmltopofbody);
-        self::assertContains('<script>', $CFG->additionalhtmltopofbody);
+        outagelib::reset_injectcalled();
+        $header1 = outagelib::get_inject_code();
+        self::assertContains('<style>', $header1);
+        self::assertContains('<script>', $header1);
 
-        // Should not inject more than once with the inject() function.
-        $size = strlen($CFG->additionalhtmltopofbody);
-        outagelib::inject();
-        self::assertSame($size, strlen($CFG->additionalhtmltopofbody));
+        // Should not inject more than once.
+        $size = strlen($OUTPUT->standard_top_of_body_html());
+        self::assertSame($size, strlen($OUTPUT->standard_top_of_body_html()));
     }
 
     /**
@@ -113,7 +112,8 @@ class outagelib_test extends auth_outage_base_testcase {
      */
     public function test_inject_broken() {
         $_GET = ['auth_outage_break_code' => '1'];
-        outagelib::reinject();
+        outagelib::reset_injectcalled();
+        $header = outagelib::get_inject_code();
         self::assertCount(2, phpunit_util::get_debugging_messages());
         phpunit_util::reset_debugging();
     }
@@ -135,12 +135,13 @@ class outagelib_test extends auth_outage_base_testcase {
             'description' => 'Description',
         ]);
         $outage->id = outagedb::save($outage);
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+
         $_GET = ['auth_outage_preview' => (string)$outage->id];
 
-        outagelib::reinject();
-        self::assertContains('<style>', $CFG->additionalhtmltopofbody);
-        self::assertContains('<script>', $CFG->additionalhtmltopofbody);
+        outagelib::reset_injectcalled();
+        $header = outagelib::get_inject_code();
+        self::assertContains('<style>', $header);
+        self::assertContains('<script>', $header);
     }
 
     /**
@@ -148,11 +149,12 @@ class outagelib_test extends auth_outage_base_testcase {
      */
     public function test_inject_preview_notfound() {
         global $CFG;
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+
         $_GET = ['auth_outage_preview' => '1'];
         // Should not throw exception or halt anything, silently ignore it.
-        outagelib::reinject();
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+        outagelib::reset_injectcalled();
+        $header = outagelib::get_inject_code();
+        self::assertEmpty($header);
     }
 
     /**
@@ -172,18 +174,21 @@ class outagelib_test extends auth_outage_base_testcase {
             'description' => 'Description',
         ]);
         $outage->id = outagedb::save($outage);
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+
         $_GET = ['auth_outage_preview' => (string)$outage->id, 'auth_outage_delta' => '500'];
-        outagelib::reinject();
+        outagelib::reset_injectcalled();
+        $header = outagelib::get_inject_code();
         // Still empty, delta is too high (outage ended).
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+        self::assertEmpty($header);
     }
 
     /**
      * Test injection without active outage.
      */
     public function test_inject_noactive() {
-        outagelib::reinject();
+        outagelib::reset_injectcalled();
+        $code = outagelib::get_inject_code();
+        self::assertNull($code);
     }
 
     /**
@@ -273,15 +278,15 @@ class outagelib_test extends auth_outage_base_testcase {
             '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'] = 'additionalhtml';
-        outagelib::reinject();
+        outagelib::reset_injectcalled();
+        $header = outagelib::get_inject_code();
 
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+        self::assertEmpty($header);
     }
 
     public function test_createmaintenancephpcode() {
@@ -499,15 +504,15 @@ EOT;
             '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();
+        outagelib::reset_injectcalled();
 
-        self::assertNotEmpty($CFG->additionalhtmltopofbody);
+        $header = outagelib::get_inject_code();
+        self::assertNotEmpty($header);
     }
 
     private function create_outage() {

version.php

@@ -28,7 +28,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = "auth_outage";
-$plugin->version = 2020032500;                  // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release = 2020032500;                  // Human-readable release information.
+$plugin->version = 2020110900;                  // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release = 2020110900;                  // Human-readable release information.
 $plugin->requires = 2017051500;                 // Requires 3.3 and higher.
 $plugin->maturity = MATURITY_STABLE;            // Suitable for PRODUCTION environments!

views/manage.php

@@ -31,14 +31,15 @@ use auth_outage\local\outagelib;
 
 defined('MOODLE_INTERNAL') || die();
 
-global $OUTPUT;
+global $PAGE;
+$output = $PAGE->get_renderer('auth_outage');
 $urlnew = new moodle_url('/auth/outage/edit.php');
 
 echo $viewbag['warning'];
 ?>
 
 <section id="section_planned_outages">
-    <?php echo renderer::get()->rendersubtitle('outageslistfuture'); ?>
+    <?php echo $output->rendersubtitle('outageslistfuture'); ?>
     <?php if (empty($viewbag['unended'])): ?>
         <p>
             <small><?php echo get_string('notfound', 'auth_outage'); ?></small>
@@ -61,7 +62,7 @@ echo $viewbag['warning'];
             echo '<p>';
             $next = outagelib::get_next_window($next);
             $urlnew->param('starttime', $next);
-            echo $OUTPUT->single_button($urlnew, get_string('outagecreate', 'auth_outage'));
+            echo $output->single_button($urlnew, get_string('outagecreate', 'auth_outage'));
             if ($default) {
                 echo ' ' . userdate( $next, get_string('datetimeformat', 'auth_outage'));
             }
@@ -70,7 +71,7 @@ echo $viewbag['warning'];
 </section>
 
 <section id="section_outage_history">
-    <?php echo renderer::get()->rendersubtitle('outageslistpast'); ?>
+    <?php echo $output->rendersubtitle('outageslistpast'); ?>
     <?php if (empty($viewbag['ended'])): ?>
         <p>
             <small><?php echo get_string('notfound', 'auth_outage'); ?></small>