Skip to content
Extraits de code Groupes Projets
Valider 9742718f rédigé par mattab's avatar mattab
Parcourir les fichiers

Revert change to not hardcode any plugin list (as nobody would remember to...

Revert change to not hardcode any plugin list (as nobody would remember to update those when we add plugins)
parent 85762b85
Branches
Étiquettes
Aucune requête de fusion associée trouvée
...@@ -72,60 +72,17 @@ class Manager extends Singleton ...@@ -72,60 +72,17 @@ class Manager extends Singleton
'LeftMenu' 'LeftMenu'
); );
public static $pluginsToLoadForTests = array( public static function getPluginsToLoadDuringTests()
"CorePluginsAdmin", {
"CoreAdminHome", $manager = \Piwik\Plugin\Manager::getInstance();
"CoreHome", $toLoad = array();
"Proxy", foreach($manager->readPluginsDirectory() as $plugin) {
"API", if($manager->isPluginBundledWithCore($plugin)) {
"Widgetize", $toLoad[] = $plugin;
"Transitions", }
"LanguagesManager", }
"Actions", return $toLoad;
"Dashboard", }
"MultiSites",
"Referrers",
"UserSettings",
"Goals",
"SEO",
"UserCountry",
"VisitsSummary",
"VisitFrequency",
"VisitTime",
"VisitorInterest",
"ExampleAPI",
"ExamplePlugin",
"ExampleRssWidget",
"Provider",
"Feedback",
"Login",
"UsersManager",
"SitesManager",
"Installation",
"CoreUpdater",
"ScheduledReports",
"UserCountryMap",
"Live",
"CustomVariables",
"PrivacyManager",
"ImageGraph",
"Annotations",
"MobileMessaging",
"Overlay",
"SegmentEditor",
"DevicesDetection",
"DBStats",
'ExampleUI',
"TasksTimetable",
"Morpheus",
"Zeitgeist",
"CustomAlerts",
"VisitorGenerator",
"SecurityInfo",
"ExampleSettingsPlugin",
"TreemapVisualization",
"Events"
);
public function getCorePluginsDisabledByDefault() public function getCorePluginsDisabledByDefault()
{ {
......
...@@ -238,7 +238,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase ...@@ -238,7 +238,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
protected static function getPluginsToLoadDuringTests() protected static function getPluginsToLoadDuringTests()
{ {
return \Piwik\Plugin\Manager::$pluginsToLoadForTests; return \Piwik\Plugin\Manager::getInstance()->getPluginsToLoadDuringTests();
} }
public function setUp() public function setUp()
......
...@@ -46,7 +46,7 @@ class Piwik_TestingEnvironment ...@@ -46,7 +46,7 @@ class Piwik_TestingEnvironment
$config->setTestEnvironment(); $config->setTestEnvironment();
$pluginsToLoad = \Piwik\Plugin\Manager::$pluginsToLoadForTests; $pluginsToLoad = \Piwik\Plugin\Manager::getInstance()->getPluginsToLoadDuringTests();
$config->Plugins = array('Plugins' => $pluginsToLoad); $config->Plugins = array('Plugins' => $pluginsToLoad);
$trackerPluginsToLoad = array( $trackerPluginsToLoad = array(
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter