From 1ca51eb57a933964e9640c02697a78c068a8c462 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Tue, 11 Apr 2017 13:31:58 +1200
Subject: [PATCH] FIX Ensure that mysite test boostrap configuration is loaded
 after core and before the database connection

---
 tests/bootstrap.php         | 1 -
 tests/bootstrap/phpunit.php | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index e6135d83a..8e3cc3409 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -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';
diff --git a/tests/bootstrap/phpunit.php b/tests/bootstrap/phpunit.php
index fa4082694..6eef9bab7 100644
--- a/tests/bootstrap/phpunit.php
+++ b/tests/bootstrap/phpunit.php
@@ -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);