tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6795 from robbieaverill/bugfix/phpunit-config-bug-with-constants 

FIX Ensure that mysite test boostrap configuration is loaded after core and before the database connection
This commit is contained in:
Damian Mooyman 2017-04-12 12:57:22 +12:00 committed by GitHub
parent ca3fa16408 1ca51eb57a
commit 7bc447eea8
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/cli.php';
require __DIR__ . '/bootstrap/environment.php';
require __DIR__ . '/bootstrap/mysite.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__ . '/../php/Control/FakeController.php';
// Bootstrap a mock project configuration
require __DIR__ . '/mysite.php';
global $databaseConfig;
DB::connect($databaseConfig);