From a3a6913983236bade09ff00ba8250e43ac4fe10f Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Mon, 6 Apr 2015 23:46:08 -0700
Subject: [PATCH] Make sure test Config is set when tearing down
IntegrationTestCase test.
---
tests/PHPUnit/Framework/Fixture.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 04d63cdce9..fb8fd9e54d 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -326,7 +326,8 @@ class Fixture extends \PHPUnit_Framework_Assert
$_GET = $_REQUEST = array();
Translate::reset();
- Config::unsetInstance();
+ IniSettingsProvider::unsetSingletonInstance();
+ Config::setSingletonInstance(new TestConfig());
Config::getInstance()->Plugins; // make sure Plugins exists in a config object for next tests that use Plugin\Manager
// since Plugin\Manager uses getFromGlobalConfig which doesn't init the config object
--
GitLab