From 7d0ea740470869464dfb5a23058fb869cc3753b9 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Sat, 12 Apr 2014 17:12:05 +1200
Subject: [PATCH] Build
---
core/Plugin/Manager.php | 3 +++
tests/PHPUnit/bootstrap.php | 1 +
2 files changed, 4 insertions(+)
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index f59435b077..bb956582f9 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -715,6 +715,9 @@ class Manager extends Singleton
*/
public function getActivatedPlugins()
{
+ if(defined('PIWIK_TEST_MODE')) {
+ return array_intersect($this->pluginsToLoad, $this->getPluginsToLoadDuringTests());
+ }
return $this->pluginsToLoad;
}
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index 7e05c43648..4a9d33be80 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -7,6 +7,7 @@
use Piwik\Http;
define('PIWIK_TEST_MODE', true);
+define('PIWIK_PRINT_ERROR_BACKTRACE', false);
if (!defined("PIWIK_PATH_TEST_TO_ROOT")) {
define('PIWIK_PATH_TEST_TO_ROOT', realpath(dirname(__FILE__) . '/../..'));
--
GitLab