From 1d0ba8adac8eac1d97aab9891e8475447d5f7839 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 2 Feb 2016 16:57:14 +1300
Subject: [PATCH] Integration test change following up
https://github.com/piwik/piwik/commit/fd199c13e185c2721860024ad4b39b856bdd53d4
---
tests/PHPUnit/Framework/Mock/Plugin/Manager.php | 10 +++++-----
tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/PHPUnit/Framework/Mock/Plugin/Manager.php b/tests/PHPUnit/Framework/Mock/Plugin/Manager.php
index 3f79065ad6..3cfbd5320a 100644
--- a/tests/PHPUnit/Framework/Mock/Plugin/Manager.php
+++ b/tests/PHPUnit/Framework/Mock/Plugin/Manager.php
@@ -4,20 +4,20 @@ namespace Piwik\Tests\Framework\Mock\Plugin;
class Manager extends \Piwik\Plugin\Manager
{
- private $installedPlugins = array();
+ private $pluginsToActivate = array();
public function __construct()
{
}
- public function setInstalledPlugins($pluginsList)
+ public function setActivatedPlugins($pluginsList)
{
- $this->installedPlugins = $pluginsList;
+ $this->pluginsToActivate = $pluginsList;
}
- public function isPluginInstalled($pluginName)
+ public function isPluginActivated($pluginName)
{
- return in_array($pluginName, $this->installedPlugins);
+ return in_array($pluginName, $this->pluginsToActivate);
}
}
diff --git a/tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php b/tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php
index 514974bed5..5d3c9c27d0 100644
--- a/tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php
+++ b/tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php
@@ -68,7 +68,7 @@ class AdvertisingTest extends IntegrationTestCase
$enabled = $this->advertising->arePiwikProAdsEnabled();
$this->assertTrue($enabled);
- $this->pluginManager->setInstalledPlugins(array('CloudAdmin'));
+ $this->pluginManager->setActivatedPlugins(array('CloudAdmin'));
$enabled = $this->advertising->arePiwikProAdsEnabled();
$this->assertFalse($enabled);
@@ -79,7 +79,7 @@ class AdvertisingTest extends IntegrationTestCase
$enabled = $this->advertising->arePiwikProAdsEnabled();
$this->assertTrue($enabled);
- $this->pluginManager->setInstalledPlugins(array('EnterpriseAdmin'));
+ $this->pluginManager->setActivatedPlugins(array('EnterpriseAdmin'));
$enabled = $this->advertising->arePiwikProAdsEnabled();
$this->assertFalse($enabled);
--
GitLab