From 9742718f792c952961303c8db9768763b4ce6e6a Mon Sep 17 00:00:00 2001 From: mattab Date: Fri, 21 Feb 2014 11:59:40 +1300 Subject: Revert change to not hardcode any plugin list (as nobody would remember to update those when we add plugins) --- tests/PHPUnit/IntegrationTestCase.php | 2 +- tests/PHPUnit/TestingEnvironment.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index b7a5829fff..42a0a3656f 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -238,7 +238,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase protected static function getPluginsToLoadDuringTests() { - return \Piwik\Plugin\Manager::$pluginsToLoadForTests; + return \Piwik\Plugin\Manager::getInstance()->getPluginsToLoadDuringTests(); } public function setUp() diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php index 3bd0ad9d91..27b11693a4 100644 --- a/tests/PHPUnit/TestingEnvironment.php +++ b/tests/PHPUnit/TestingEnvironment.php @@ -46,7 +46,7 @@ class Piwik_TestingEnvironment $config->setTestEnvironment(); - $pluginsToLoad = \Piwik\Plugin\Manager::$pluginsToLoadForTests; + $pluginsToLoad = \Piwik\Plugin\Manager::getInstance()->getPluginsToLoadDuringTests(); $config->Plugins = array('Plugins' => $pluginsToLoad); $trackerPluginsToLoad = array( -- cgit v1.2.3