diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-02-21 02:59:40 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-02-21 02:59:40 +0400 |
commit | 9742718f792c952961303c8db9768763b4ce6e6a (patch) | |
tree | 764f8dd6872c4e24956b3e90d88b056eeea1bc6c /tests | |
parent | 85762b85b8d8245f68ad198a82c8df187fa23bb1 (diff) |
Revert change to not hardcode any plugin list (as nobody would remember to update those when we add plugins)
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/PHPUnit/IntegrationTestCase.php | 2 | ||||
-rw-r--r-- | tests/PHPUnit/TestingEnvironment.php | 2 |
2 files changed, 2 insertions, 2 deletions
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( |