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:
authorStefan Giehl <stefan@matomo.org>2020-04-16 09:07:48 +0300
committerGitHub <noreply@github.com>2020-04-16 09:07:48 +0300
commite943702e1e54bfc71d423bfd2ec2a48c0a4610f7 (patch)
tree3e22b427c2173bf396e3ca4b3d36fd3f33c4385b /plugins/Marketplace
parent97cf78a8a1365a9485597f2f24d1edb0becf099a (diff)
Assume plugins that do not define a upper bound for Matomo version re… (#15796)
* Assume plugins that do not define a upper bound for Matomo version requirement as incompatible with Matomo 4 * improve version dependency detection * improve/fix tests
Diffstat (limited to 'plugins/Marketplace')
-rw-r--r--plugins/Marketplace/tests/Integration/PluginsTest.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/Marketplace/tests/Integration/PluginsTest.php b/plugins/Marketplace/tests/Integration/PluginsTest.php
index d3b0a73bb8..e09a76a70d 100644
--- a/plugins/Marketplace/tests/Integration/PluginsTest.php
+++ b/plugins/Marketplace/tests/Integration/PluginsTest.php
@@ -390,7 +390,10 @@ class PluginsTest extends IntegrationTestCase
$this->assertTrue(in_array($plugin['isInstalled'], array(true, false), true));
$this->assertFalse($plugin['isInvalid']);
$this->assertTrue(isset($plugin['canBeUpdated']));
- $this->assertSame(array(), $plugin['missingRequirements']);
+ $this->assertSame([['requirement' => 'piwik',
+ 'actualVersion' => '4.0.0-b1',
+ 'requiredVersion' => '>=2.0.4-b5,<3.0.0-b1',
+ 'causedBy' => '<3.0.0-b1']], $plugin['missingRequirements']);
$this->assertSame(Plugin\Manager::getInstance()->isPluginActivated('SecurityInfo'), $plugin['isActivated']);
} elseif ($name === 'SimplePageBuilder') {
// should add campaign parameters if Piwik PRO plugin
@@ -464,7 +467,10 @@ class PluginsTest extends IntegrationTestCase
$this->assertSame($pluginName, $plugin['name']);
$this->assertSame($pluginManager->getLoadedPlugin($pluginName)->getVersion(), $plugin['currentVersion']);
$this->assertSame($pluginManager->isPluginActivated($pluginName), $plugin['isActivated']);
- $this->assertSame(array(), $plugin['missingRequirements']);
+ $this->assertSame([['requirement' => 'piwik',
+ 'actualVersion' => '4.0.0-b1',
+ 'requiredVersion' => '>=2.0.0,<3.0.0-b1',
+ 'causedBy' => '<3.0.0-b1']], $plugin['missingRequirements']);
$this->assertSame('https://github.com/piwik/plugin-TreemapVisualization/commits/1.0.1', $plugin['repositoryChangelogUrl']);
$expectedApiCalls = array(