Skip to content

Commit

Permalink
BUGFIX Fixing bootstrap.php to work with FakeController properly for
Browse files Browse the repository at this point in the history
running tests using phpunit.xml file.
  • Loading branch information
halkyon committed May 9, 2012
1 parent f546ab2 commit 8b607db
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion main.php
Expand Up @@ -96,7 +96,7 @@
} }


// Connect to database // Connect to database
require_once("model/DB.php"); require_once('model/DB.php');


// Redirect to the installer if no database is selected // Redirect to the installer if no database is selected
if(!isset($databaseConfig) || !isset($databaseConfig['database']) || !$databaseConfig['database']) { if(!isset($databaseConfig) || !isset($databaseConfig['database']) || !$databaseConfig['database']) {
Expand Down
4 changes: 3 additions & 1 deletion tests/bootstrap.php
Expand Up @@ -37,7 +37,9 @@
$_GET['flush'] = 1; $_GET['flush'] = 1;


// Connect to database // Connect to database
require_once($frameworkPath . "/core/Core.php"); require_once $frameworkPath . '/core/Core.php';
require_once $frameworkPath . '/tests/FakeController.php';

global $databaseConfig; global $databaseConfig;
DB::connect($databaseConfig); DB::connect($databaseConfig);


Expand Down

0 comments on commit 8b607db

Please sign in to comment.