From 8b607db0a23f0a227491248db1406d0f8d183492 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Wed, 9 May 2012 22:42:45 +1200 Subject: [PATCH] BUGFIX Fixing bootstrap.php to work with FakeController properly for running tests using phpunit.xml file. --- main.php | 2 +- tests/bootstrap.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/main.php b/main.php index 1391b81cd..b81ef254f 100644 --- a/main.php +++ b/main.php @@ -96,7 +96,7 @@ if (isset($_GET['debug_profile'])) { } // Connect to database -require_once("model/DB.php"); +require_once('model/DB.php'); // Redirect to the installer if no database is selected if(!isset($databaseConfig) || !isset($databaseConfig['database']) || !$databaseConfig['database']) { diff --git a/tests/bootstrap.php b/tests/bootstrap.php index e385e321a..00af634fa 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -37,7 +37,9 @@ if(isset($_SERVER['argv'][2])) { $_GET['flush'] = 1; // Connect to database -require_once($frameworkPath . "/core/Core.php"); +require_once $frameworkPath . '/core/Core.php'; +require_once $frameworkPath . '/tests/FakeController.php'; + global $databaseConfig; DB::connect($databaseConfig);