refs #4357 probably a better fix to make the integration tests working

matomo-org · Dec 4, 2013 · d323058 · d323058
1 parent 034742a
commit d323058
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/Tracker.php b/core/Tracker.php
@@ -788,7 +788,8 @@ public static function setTestEnvironment($args = null, $requestMethod = null)
         self::setPluginsNotToLoad($pluginsDisabled);
 
         // we load 'DevicesDetection' in tests only (disabled by default)
-        self::setPluginsToLoad(array('DevicesDetection'));
+        $plugins = array_merge(array('DevicesDetection'), Config::getInstance()->Plugins['Plugins']);
+        self::setPluginsToLoad($plugins);
     }
 
     /**

diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php
@@ -55,7 +55,7 @@ protected function sendRequest($url, $method = 'GET', $data = null, $force = fal
         $pluginsTracker = Config::getInstance()->Plugins_Tracker['Plugins_Tracker'];
         $oldTrackerConfig = Config::getInstance()->Tracker;
 
-        //\Piwik\Plugin\Manager::getInstance()->unloadPlugins();
+        \Piwik\Plugin\Manager::getInstance()->unloadPlugins();
 
         // modify config
         $GLOBALS['PIWIK_TRACKER_MODE'] = true;