diff options
| author | diosmosis <benaka@piwik.pro> | 2015-05-01 03:13:20 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-05-01 03:13:20 +0300 |
| commit | 5e5a7ddea69adae689b5d94f85b990affbda380a (patch) | |
| tree | cf29eabbc1fe1ccc27d5fae685241cdd8b18fb0e /tests/PHPUnit/Framework/Mock | |
| parent | 4bd65d99355243b9c628323d500d669ccd0461cc (diff) | |
Fix last commit, unset IniSettingsProvider singleton in TestConfig __construct to fix other tests & do not call assetManager::removeMergedAssets method in tearDown of test if it was not successfully created.
Diffstat (limited to 'tests/PHPUnit/Framework/Mock')
| -rw-r--r-- | tests/PHPUnit/Framework/Mock/TestConfig.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/PHPUnit/Framework/Mock/TestConfig.php b/tests/PHPUnit/Framework/Mock/TestConfig.php index 4feb2b3e58..75c67e7d62 100644 --- a/tests/PHPUnit/Framework/Mock/TestConfig.php +++ b/tests/PHPUnit/Framework/Mock/TestConfig.php @@ -20,6 +20,8 @@ class TestConfig extends Config public function __construct($pathGlobal = null, $pathLocal = null, $pathCommon = null, $allowSave = false, $doSetTestEnvironment = true) { + \Piwik\Application\Kernel\GlobalSettingsProvider\IniSettingsProvider::unsetSingletonInstance(); + parent::__construct($pathGlobal, $pathLocal, $pathCommon); $this->allowSave = $allowSave; |