diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/LocalTracker.php | 2 | ||||
| -rw-r--r-- | tests/PHPUnit/Core/TaskSchedulerTest.php | 8 | ||||
| -rw-r--r-- | tests/PHPUnit/DatabaseTestCase.php | 1 | ||||
| -rw-r--r-- | tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php | 4 | ||||
| -rw-r--r-- | tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php index 3bd3d831ad..d8ca29ea44 100755 --- a/tests/LocalTracker.php +++ b/tests/LocalTracker.php @@ -55,7 +55,7 @@ class Piwik_LocalTracker extends PiwikTracker $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; diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php index 4a47071baf..c6f937a6c3 100644 --- a/tests/PHPUnit/Core/TaskSchedulerTest.php +++ b/tests/PHPUnit/Core/TaskSchedulerTest.php @@ -280,10 +280,6 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins(); $plugins = array_map(function ($p) { return $p->getPluginName(); }, $plugins); - // stub the piwik option object to control the returned option value - self::stubPiwikOption(serialize($timetableBeforeTaskExecution)); - TaskScheduler::unsetInstance(); - \Piwik\Plugin\Manager::getInstance()->unloadPlugins(); // make sure the get tasks event returns our configured tasks @@ -291,6 +287,10 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase $tasks = $configuredTasks; }); + // stub the piwik option object to control the returned option value + self::stubPiwikOption(serialize($timetableBeforeTaskExecution)); + TaskScheduler::unsetInstance(); + // execute tasks $executionResults = TaskScheduler::runTasks(); diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php index 333971b8e1..1c0968539c 100644 --- a/tests/PHPUnit/DatabaseTestCase.php +++ b/tests/PHPUnit/DatabaseTestCase.php @@ -48,6 +48,7 @@ class DatabaseTestCase extends PHPUnit_Framework_TestCase Db::createDatabaseObject(); DbHelper::createTables(); +// \Piwik\Manager::getInstance()->loadPlugins(array()); IntegrationTestCase::loadAllPlugins(); } catch (Exception $e) { diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php index e81f0790f4..4bbb959f86 100644 --- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php +++ b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php @@ -34,7 +34,7 @@ class Plugins_MobileMessagingTest extends DatabaseTestCase $this->idSiteAccess = APISitesManager::getInstance()->addSite("test", "http://test"); - \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'MultiSites', 'LanguagesManager')); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'MultiSites')); \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins(); } @@ -47,7 +47,7 @@ class Plugins_MobileMessagingTest extends DatabaseTestCase public function testWarnUserViaSMSMultiSitesDeactivated() { // safety net - \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'LanguagesManager')); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging')); $this->assertFalse(\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MultiSites')); $APIScheduledReports = APIScheduledReports::getInstance(); diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php index 99dd590624..44da874c37 100644 --- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php +++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php @@ -34,7 +34,7 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase // setup the access layer self::setSuperUser(); - \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('API', 'UserCountry', 'ScheduledReports', 'MobileMessaging', 'LanguagesManager')); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('API', 'UserCountry', 'ScheduledReports', 'MobileMessaging')); \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins(); APISitesManager::getInstance()->addSite("Test", array("http://piwik.net")); @@ -200,7 +200,7 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase public function testGetTopMenuTranslationKeyMobileMessagingInactive() { // unload MobileMessaging plugin - \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'LanguagesManager')); + \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports')); $pdfReportPlugin = new ScheduledReports(); $this->assertEquals( |