Merge "Allowing for phpunit test to warn about need install first"

76f9c9d2 · Robert Lyon · Gerrit Code Review · 564f3e36 · b8470848 · 76f9c9d2
Commit 76f9c9d2 authored Dec 14, 2015 by Robert Lyon Committed by Gerrit Code Review Dec 14, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

htdocs/init.php htdocs/init.php +3 -0

No files found.
--- a/htdocs/init.php
+++ b/htdocs/init.php
@@ -421,6 +421,9 @@ if ($siteclosed && !$USER->admin) {
 // check to see if we're installed...
 if (!get_config('installed')) {
    ensure_install_sanity();
+    if (defined('TESTSRUNNING')) {
+        die("Need to have Mahara installed before phpunit tests will run. Please install via 'php htdocs/admin/cli/install.php'");
+    }

    $scriptfilename = str_replace('\\', '/', $_SERVER['SCRIPT_FILENAME']);
    if (!defined('CLI')