diff options
| author | diosmosis <benaka@piwik.pro> | 2015-04-02 08:15:18 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-04-02 08:15:18 +0300 |
| commit | 695bfe6c853cdd0afb4c37ac91dc612145fb4b60 (patch) | |
| tree | 58ab5d8198318f41c7c3e7cf642f2255a2b8a726 /tests/PHPUnit/bootstrap.php | |
| parent | 342f9454f5b5b32453fbbeb15da1ddc2515bd1fa (diff) | |
Remove uses of Config::init(), Config::clear() and Config::setTestEnvironment(). Replace last w/ mock config class, which is closer to use of DI.
Diffstat (limited to 'tests/PHPUnit/bootstrap.php')
| -rw-r--r-- | tests/PHPUnit/bootstrap.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php index 5a7eb7bce2..edaea8a9f4 100644 --- a/tests/PHPUnit/bootstrap.php +++ b/tests/PHPUnit/bootstrap.php @@ -45,8 +45,6 @@ if (getenv('PIWIK_USE_XHPROF') == 1) { // setup container for tests StaticContainer::setEnvironment('test'); -\Piwik\Config::getInstance()->setTestEnvironment(); - // require test fixtures $fixturesToLoad = array( '/tests/UI/Fixtures/*.php', @@ -113,7 +111,7 @@ if (!SettingsPiwik::isPiwikInstalled()) { } $config = Config::getInstance(); -$config->init(); + prepareServerVariables($config); prepareTestDatabaseConfig($config); checkPiwikSetupForTests(); |