Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-02-21 04:46:37 +0400
committermattab <matthieu.aubry@gmail.com>2014-02-21 04:46:37 +0400
commit13a4576d339d817289f279b36ba3c15600a0fa20 (patch)
tree8119eae25cf5b93a81e01f08b921a20d5714720a
parentc3742bba5bbab496cbba90b306fd84150a7112d6 (diff)
Proper fix
-rw-r--r--core/Plugin/Manager.php1
-rw-r--r--tests/PHPUnit/Core/ReleaseCheckListTest.php4
2 files changed, 4 insertions, 1 deletions
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 0de9ad97ca..6c6578fe6e 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -70,7 +70,6 @@ class Manager extends Singleton
'ExamplePluginTemplate',
'ExampleTheme',
'LeftMenu',
- 'Zeitgeist',
);
public function getPluginsToLoadDuringTests()
diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Core/ReleaseCheckListTest.php
index 9f756a0a6c..284810f3c3 100644
--- a/tests/PHPUnit/Core/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Core/ReleaseCheckListTest.php
@@ -190,6 +190,10 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase
// if not added to git, then it is not part of the release checklist.
continue;
}
+
+ if($pluginName === \Piwik\Plugin\Manager::DEFAULT_THEME) {
+ continue;
+ }
$manager = \Piwik\Plugin\Manager::getInstance();
$disabled = in_array($pluginName, $manager->getCorePluginsDisabledByDefault());