tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX Ensure that mysite test boostrap configuration is loaded after core and before the database connection

Browse Source
This commit is contained in:
Robbie Averill 2017-04-11 13:31:58 +12:00
parent b8c3bf6fa5
commit 1ca51eb57a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/bootstrap.php
View File

@ -3,5 +3,4 @@
require __DIR__ . '/bootstrap/init.php'; require __DIR__ . '/bootstrap/init.php';
require __DIR__ . '/bootstrap/cli.php'; require __DIR__ . '/bootstrap/cli.php';
require __DIR__ . '/bootstrap/environment.php'; require __DIR__ . '/bootstrap/environment.php';
require __DIR__ . '/bootstrap/mysite.php';
require __DIR__ . '/bootstrap/phpunit.php'; require __DIR__ . '/bootstrap/phpunit.php';

3
tests/bootstrap/phpunit.php
View File

@ -8,6 +8,9 @@ use SilverStripe\ORM\DB;
require_once __DIR__ . '/../../src/Core/Core.php'; require_once __DIR__ . '/../../src/Core/Core.php';
require_once __DIR__ . '/../php/Control/FakeController.php'; require_once __DIR__ . '/../php/Control/FakeController.php';
// Bootstrap a mock project configuration
require __DIR__ . '/mysite.php';
global $databaseConfig; global $databaseConfig;
DB::connect($databaseConfig); DB::connect($databaseConfig);