diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-11-15 04:03:59 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-11-15 04:03:59 +0300 |
| commit | 587cc39e0362719332d410b7a4d5ddcc68788eeb (patch) | |
| tree | c982c369cdda542c3a4de08be11c893e5364838c /tests | |
| parent | 64314b26dbc6619d535002bdb79b9e55d1fc87db (diff) | |
Update Marketplace to work with new API (#10799)
* starting to port marketplace to piwik 3
* updating tests
* fix translation key
* fix various issues
* use material select
* fix plugin upload
* deprecate license_homepage plugin metadata and link to a LICENSE[.md|.txt] file if found (#10756)
* deprecate license_homepage plugin metadata, and link to a LICENSE[.md|.txt] file if found
* Make license view HTML only without menu
* fix tests and update
* fix some links did not work
* we need to show warnings even when plugin is installed, not only when activated. otherwise it is not clear why something is not downloadable
* fix install was not working
* improved responsiveness of marketplace
* fix more tests
* fix search was shown when only a few plugins are there
* fix ui tests
* fix some translations
* fix tests and remove duplicated test
Diffstat (limited to 'tests')
64 files changed, 568 insertions, 152 deletions
diff --git a/tests/PHPUnit/Integration/DependencyTest.php b/tests/PHPUnit/Integration/DependencyTest.php index 0f0de5562c..8a6d98d2ce 100644 --- a/tests/PHPUnit/Integration/DependencyTest.php +++ b/tests/PHPUnit/Integration/DependencyTest.php @@ -147,7 +147,7 @@ class DependencyTest extends IntegrationTestCase public function test_getMissingVersion_EmptyCurrentVersion_ShouldBeDeclaredAsMissing() { - $this->assertMissingVersion('', '5.5', array('>=5.5')); + $this->assertMissingVersion('', '>=5.5', array('>=5.5')); } public function test_getMissingVersion_EmptyRequiredVersion_ShouldBeIgnored() @@ -248,6 +248,26 @@ class DependencyTest extends IntegrationTestCase $this->assertMissingVersion('6.4', '>=5.2,<=9.0', array()); } + /** + * @dataProvider getHasDepenedencyToDisabledPluginProvider + */ + public function test_hasDependencyToDisabledPlugin($expectedHasDependency, $requires) + { + $this->assertSame($expectedHasDependency, $this->dependency->hasDependencyToDisabledPlugin($requires)); + } + + public function getHasDepenedencyToDisabledPluginProvider() + { + return array( + array($expected = false, $requires = null), + array($expected = false, $requires = array()), + array($expected = false, $requires = array('php' => '<5.2', 'piwik' => '<2.0')), + array($expected = false, $requires = array('php' => '<5.2', 'piwik' => '<2.0', 'CoreHome' => '2.15.0')), + array($expected = false, $requires = array('CoreHome' => '<2.0', 'Actions' => '>=2.15.0')), + array($expected = true, $requires = array('php' => '<5.2', 'piwik' => '<2.0', 'FooBar' => '2.15.0')), + ); + } + private function missingPiwik($requiredVersion, $causedBy = null) { return $this->buildMissingDependecy('piwik', Version::VERSION, $requiredVersion, $causedBy); diff --git a/tests/PHPUnit/Integration/Plugin/ManagerTest.php b/tests/PHPUnit/Integration/Plugin/ManagerTest.php index 5822e22c05..b533b1e056 100644 --- a/tests/PHPUnit/Integration/Plugin/ManagerTest.php +++ b/tests/PHPUnit/Integration/Plugin/ManagerTest.php @@ -127,14 +127,14 @@ class ManagerTest extends IntegrationTestCase array(true, 'pluginNameTest'), array(true, 'PluginNameTest'), array(true, 'PluginNameTest92323232eerwrwere938'), + array(true, 'a_ererer'), + array(true, 'a_'), array(false, ''), array(false, '0'), array(false, '0a'), array(false, 'a.'), array(false, 'a-'), - array(false, 'a_'), array(false, 'a-ererer'), - array(false, 'a_ererer'), array(false, '..'), array(false, '/'), ); diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php index c8bce62d51..a8787cc5ee 100644 --- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php +++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php @@ -179,7 +179,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase })(); </script> -<script type='text/javascript' src="//localhost/piwik/piwik.js"> +<script type='text/javascript' src="//localhost/piwik/piwik.js"></script> <noscript><p><img src="//localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> "; diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 447ef39261..250f47704a 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -576,7 +576,7 @@ <isReport>1</isReport> </row> <row> - <name>Region</name> + <name>Visitor Map</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -588,20 +588,18 @@ <name>Locations</name> <order>25</order> </subcategory> - <module>UserCountry</module> - <action>getRegion</action> - <order>107</order> + <module>UserCountryMap</module> + <action>visitorMap</action> + <order>1</order> <parameters> - <module>UserCountry</module> - <action>getRegion</action> + <module>UserCountryMap</module> + <action>visitorMap</action> </parameters> - <uniqueId>widgetUserCountrygetRegion</uniqueId> + <uniqueId>widgetUserCountryMapvisitorMap</uniqueId> <isWide>0</isWide> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> </row> <row> - <name>Visitor Map</name> + <name>Region</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -613,15 +611,17 @@ <name>Locations</name> <order>25</order> </subcategory> - <module>UserCountryMap</module> - <action>visitorMap</action> - <order>1</order> + <module>UserCountry</module> + <action>getRegion</action> + <order>107</order> <parameters> - <module>UserCountryMap</module> - <action>visitorMap</action> + <module>UserCountry</module> + <action>getRegion</action> </parameters> - <uniqueId>widgetUserCountryMapvisitorMap</uniqueId> + <uniqueId>widgetUserCountrygetRegion</uniqueId> <isWide>0</isWide> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> </row> <row> <name>Continent</name> @@ -778,7 +778,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits per visit duration</name> + <name>Visits by Visit Number</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -791,15 +791,15 @@ <order>30</order> </subcategory> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerVisitDuration</action> - <order>115</order> + <action>getNumberOfVisitsByVisitCount</action> + <order>125</order> <parameters> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerVisitDuration</action> + <action>getNumberOfVisitsByVisitCount</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsByVisitCount</uniqueId> <isWide>0</isWide> - <viewDataTable>cloud</viewDataTable> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> @@ -822,7 +822,7 @@ <isWide>0</isWide> </row> <row> - <name>Visits by Visit Number</name> + <name>Visits per visit duration</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -835,15 +835,15 @@ <order>30</order> </subcategory> <module>VisitorInterest</module> - <action>getNumberOfVisitsByVisitCount</action> - <order>125</order> + <action>getNumberOfVisitsPerVisitDuration</action> + <order>115</order> <parameters> <module>VisitorInterest</module> - <action>getNumberOfVisitsByVisitCount</action> + <action>getNumberOfVisitsPerVisitDuration</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsByVisitCount</uniqueId> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId> <isWide>0</isWide> - <viewDataTable>table</viewDataTable> + <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> <row> @@ -1864,7 +1864,7 @@ <isWide>0</isWide> </row> <row> - <name>Product SKU</name> + <name>Product Category</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1877,19 +1877,19 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsSku</action> - <order>130</order> + <action>getItemsCategory</action> + <order>132</order> <parameters> <module>Goals</module> - <action>getItemsSku</action> + <action>getItemsCategory</action> </parameters> - <uniqueId>widgetGoalsgetItemsSku</uniqueId> + <uniqueId>widgetGoalsgetItemsCategory</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Product Category</name> + <name>Product SKU</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1902,13 +1902,13 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsCategory</action> - <order>132</order> + <action>getItemsSku</action> + <order>130</order> <parameters> <module>Goals</module> - <action>getItemsCategory</action> + <action>getItemsSku</action> </parameters> - <uniqueId>widgetGoalsgetItemsCategory</uniqueId> + <uniqueId>widgetGoalsgetItemsSku</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> @@ -2748,7 +2748,7 @@ <isReport>1</isReport> </row> <row> - <name>Piwik Changelog</name> + <name>Piwik.org Blog</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2757,17 +2757,17 @@ </category> <subcategory /> <module>RssWidget</module> - <action>rssChangelog</action> + <action>rssPiwik</action> <order>99</order> <parameters> <module>RssWidget</module> - <action>rssChangelog</action> + <action>rssPiwik</action> </parameters> - <uniqueId>widgetRssWidgetrssChangelog</uniqueId> + <uniqueId>widgetRssWidgetrssPiwik</uniqueId> <isWide>0</isWide> </row> <row> - <name>System Summary</name> + <name>Example Widget Name</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2775,18 +2775,18 @@ <icon /> </category> <subcategory /> - <module>CoreHome</module> - <action>getSystemSummary</action> - <order>15</order> + <module>ExamplePlugin</module> + <action>myExampleWidget</action> + <order>99</order> <parameters> - <module>CoreHome</module> - <action>getSystemSummary</action> + <module>ExamplePlugin</module> + <action>myExampleWidget</action> </parameters> - <uniqueId>widgetCoreHomegetSystemSummary</uniqueId> + <uniqueId>widgetExamplePluginmyExampleWidget</uniqueId> <isWide>0</isWide> </row> <row> - <name>Top Keywords for Page URL</name> + <name>SEO Rankings</name> <category> <id>SEO</id> <name>SEO</name> @@ -2794,18 +2794,18 @@ <icon /> </category> <subcategory /> - <module>Referrers</module> - <action>getKeywordsForPage</action> + <module>SEO</module> + <action>getRank</action> <order>99</order> <parameters> - <module>Referrers</module> - <action>getKeywordsForPage</action> + <module>SEO</module> + <action>getRank</action> </parameters> - <uniqueId>widgetReferrersgetKeywordsForPage</uniqueId> + <uniqueId>widgetSEOgetRank</uniqueId> <isWide>0</isWide> </row> <row> - <name>Piwik.org Blog</name> + <name>System Check</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2813,18 +2813,18 @@ <icon /> </category> <subcategory /> - <module>RssWidget</module> - <action>rssPiwik</action> - <order>99</order> + <module>Installation</module> + <action>getSystemCheck</action> + <order>16</order> <parameters> - <module>RssWidget</module> - <action>rssPiwik</action> + <module>Installation</module> + <action>getSystemCheck</action> </parameters> - <uniqueId>widgetRssWidgetrssPiwik</uniqueId> + <uniqueId>widgetInstallationgetSystemCheck</uniqueId> <isWide>0</isWide> </row> <row> - <name>Latest Marketplace Updates</name> + <name>Support Piwik!</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2832,33 +2832,33 @@ <icon /> </category> <subcategory /> - <module>CorePluginsAdmin</module> - <action>getNewPlugins</action> - <order>19</order> + <module>CoreHome</module> + <action>getDonateForm</action> + <order>5</order> <parameters> - <module>CorePluginsAdmin</module> - <action>getNewPlugins</action> + <module>CoreHome</module> + <action>getDonateForm</action> </parameters> - <uniqueId>widgetCorePluginsAdmingetNewPlugins</uniqueId> + <uniqueId>widgetCoreHomegetDonateForm</uniqueId> <isWide>0</isWide> </row> <row> - <name>SEO Rankings</name> + <name>Piwik Changelog</name> <category> - <id>SEO</id> - <name>SEO</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> <subcategory /> - <module>SEO</module> - <action>getRank</action> + <module>RssWidget</module> + <action>rssChangelog</action> <order>99</order> <parameters> - <module>SEO</module> - <action>getRank</action> + <module>RssWidget</module> + <action>rssChangelog</action> </parameters> - <uniqueId>widgetSEOgetRank</uniqueId> + <uniqueId>widgetRssWidgetrssChangelog</uniqueId> <isWide>0</isWide> </row> <row> @@ -2881,7 +2881,7 @@ <isWide>0</isWide> </row> <row> - <name>Welcome!</name> + <name>System Summary</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2890,36 +2890,36 @@ </category> <subcategory /> <module>CoreHome</module> - <action>getPromoVideo</action> - <order>10</order> + <action>getSystemSummary</action> + <order>15</order> <parameters> <module>CoreHome</module> - <action>getPromoVideo</action> + <action>getSystemSummary</action> </parameters> - <uniqueId>widgetCoreHomegetPromoVideo</uniqueId> + <uniqueId>widgetCoreHomegetSystemSummary</uniqueId> <isWide>0</isWide> </row> <row> - <name>Movers and Shakers</name> + <name>Latest Marketplace Updates</name> <category> - <id>Insights_WidgetCategory</id> - <name>Insights</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> <subcategory /> - <module>Insights</module> - <action>getOverallMoversAndShakers</action> - <order>99</order> + <module>Marketplace</module> + <action>getNewPlugins</action> + <order>19</order> <parameters> - <module>Insights</module> - <action>getOverallMoversAndShakers</action> + <module>Marketplace</module> + <action>getNewPlugins</action> </parameters> - <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId> + <uniqueId>widgetMarketplacegetNewPlugins</uniqueId> <isWide>0</isWide> </row> <row> - <name>System Check</name> + <name>Welcome!</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2927,56 +2927,56 @@ <icon /> </category> <subcategory /> - <module>Installation</module> - <action>getSystemCheck</action> - <order>16</order> + <module>CoreHome</module> + <action>getPromoVideo</action> + <order>10</order> <parameters> - <module>Installation</module> - <action>getSystemCheck</action> + <module>CoreHome</module> + <action>getPromoVideo</action> </parameters> - <uniqueId>widgetInstallationgetSystemCheck</uniqueId> + <uniqueId>widgetCoreHomegetPromoVideo</uniqueId> <isWide>0</isWide> </row> <row> - <name>Example Widget Name</name> + <name>Top Keywords for Page URL</name> <category> - <id>About Piwik</id> - <name>About Piwik</name> + <id>SEO</id> + <name>SEO</name> <order>99</order> <icon /> </category> <subcategory /> - <module>ExamplePlugin</module> - <action>myExampleWidget</action> + <module>Referrers</module> + <action>getKeywordsForPage</action> <order>99</order> <parameters> - <module>ExamplePlugin</module> - <action>myExampleWidget</action> + <module>Referrers</module> + <action>getKeywordsForPage</action> </parameters> - <uniqueId>widgetExamplePluginmyExampleWidget</uniqueId> + <uniqueId>widgetReferrersgetKeywordsForPage</uniqueId> <isWide>0</isWide> </row> <row> - <name>Support Piwik!</name> + <name>Insights Overview</name> <category> - <id>About Piwik</id> - <name>About Piwik</name> + <id>Insights_WidgetCategory</id> + <name>Insights</name> <order>99</order> <icon /> </category> <subcategory /> - <module>CoreHome</module> - <action>getDonateForm</action> - <order>5</order> + <module>Insights</module> + <action>getInsightsOverview</action> + <order>99</order> <parameters> - <module>CoreHome</module> - <action>getDonateForm</action> + <module>Insights</module> + <action>getInsightsOverview</action> </parameters> - <uniqueId>widgetCoreHomegetDonateForm</uniqueId> + <uniqueId>widgetInsightsgetInsightsOverview</uniqueId> <isWide>0</isWide> </row> <row> - <name>Insights Overview</name> + <name>Movers and Shakers</name> <category> <id>Insights_WidgetCategory</id> <name>Insights</name> @@ -2985,13 +2985,13 @@ </category> <subcategory /> <module>Insights</module> - <action>getInsightsOverview</action> + <action>getOverallMoversAndShakers</action> <order>99</order> <parameters> <module>Insights</module> - <action>getInsightsOverview</action> + <action>getOverallMoversAndShakers</action> </parameters> - <uniqueId>widgetInsightsgetInsightsOverview</uniqueId> + <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId> <isWide>0</isWide> </row> </result>
\ No newline at end of file diff --git a/tests/UI/expected-screenshots/DashboardManager_expanded.png b/tests/UI/expected-screenshots/DashboardManager_expanded.png index cf63988ca4..03c98e51cf 100644 --- a/tests/UI/expected-screenshots/DashboardManager_expanded.png +++ b/tests/UI/expected-screenshots/DashboardManager_expanded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94ab82e309d168027b35fed07b6d294d19f61a5cc6a7e15da2747c8a47a41ec7 +oid sha256:6c1030ac68bbe0fb9baf84a4be91c92b37c52541e13edd3c67515f9e865dc45c size 44477 diff --git a/tests/UI/expected-screenshots/DashboardManager_removed.png b/tests/UI/expected-screenshots/DashboardManager_removed.png index 9a67088181..493649357f 100644 --- a/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67f102d004d96f1838a5e89e8b6947b25322216aaf97ea89e53a6a69503e0c57 -size 219517 +oid sha256:30f231fc59852a5daba1380f6988723885135744c6efdf8cc891443aa3509277 +size 361692 diff --git a/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png index 208c5545f9..2211071116 100644 --- a/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png +++ b/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2002a14c40355462fb24a20f770eab28f1f5f4d3ec6917f9a47b54d1dd1b61a -size 54387 +oid sha256:ce88bb1a6ad4eec0abd85f53526fe464e5a423ff8f28ad63ea9f7aac679d9471 +size 54385 diff --git a/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/tests/UI/expected-screenshots/DashboardManager_widget_preview.png index 5494fb208c..03f18720d0 100644 --- a/tests/UI/expected-screenshots/DashboardManager_widget_preview.png +++ b/tests/UI/expected-screenshots/DashboardManager_widget_preview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6f88f00f657d056c2cf021b560b65104e920220ac481e754fb78eae00eb3deb -size 65821 +oid sha256:d84f304a6f52151dd3dc34e72dd938e0a2078632041af219a935c431191fff69 +size 65779 diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png index dd384cfc69..07085c8a8d 100644 --- a/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:805b8c45f5d3a164970322440412267c56b84843793c23f5df8e21aea214a81d -size 335467 +oid sha256:a7b19d0b352d391ef1567f053862b82f1b6fc2d6b0b4b7e4e70062a459e6374e +size 530636 diff --git a/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png b/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png new file mode 100644 index 0000000000..2b865112d3 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5abd8822925543da92bfe8952a7c72a1c3a33d35c5ee21373f24a83231846880 +size 65886 diff --git a/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png b/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png new file mode 100644 index 0000000000..96215d6885 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d831b82a0569fae95cb3445282f95be26586c6a78361a060cc7a509253f75088 +size 47793 diff --git a/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png b/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png new file mode 100644 index 0000000000..bdb8a34697 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92e1339288dbbeecbb6e404c3f6a07f40248ae814958220f7448ee25f06c4975 +size 45867 diff --git a/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_exceededLicense.png b/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_exceededLicense.png new file mode 100644 index 0000000000..00a8ac2874 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_exceededLicense.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3592aa6614d0d93e28573fa06e3e5b45d49f5405a03ce52f32e60c9cdad9162 +size 26736 diff --git a/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png b/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png new file mode 100644 index 0000000000..61b9a684ee --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8884e2d728e9b59dda5b2a186fe355fa1e316ea000c0c1cb172c000cc747ca10 +size 25172 diff --git a/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png b/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png new file mode 100644 index 0000000000..fc0a2a43f5 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9cbd3fb3d800ec594bbcae770b5bd87a47793e6ddd08a513847fa6de3069e3f +size 22054 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png new file mode 100644 index 0000000000..870eb3a98b --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:091cebccaa5c599d78504a10a83537beafbfd6f100add6116b7c9f388ce772f2 +size 78678 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png new file mode 100644 index 0000000000..ac5b71c9cf --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4aa8c4d21824b42f38f86ea9ed45293ba8cd703f857a2f66960c859b80dd37b +size 59189 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png new file mode 100644 index 0000000000..ef638514d6 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87c51ce152fd1674f1775a3ea079bc2e7604a4515c13d712af954bd7e1689559 +size 42977 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png new file mode 100644 index 0000000000..769990ad67 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65121175a97eaafbaeaadcd11c2e81a0795cf202bee85947da8612453af13501 +size 76262 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png new file mode 100644 index 0000000000..40e09d34e0 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53eddafe234c4d1f844aaed9b1593f75a08d8670f0de87ff3a52a41e40ebe7d6 +size 57088 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png new file mode 100644 index 0000000000..ffdb015738 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef479063eacbffac314a1665d52e90bc22676b9c7eb1f16c942af84f93c30e04 +size 42812 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment.png new file mode 100644 index 0000000000..f7b97bca7e --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f7ad3b0cc4aa9958ecd749537042ce83976a78ee380a4dcbe1645e2ef7ded7d +size 60698 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png new file mode 100644 index 0000000000..eaedf044fa --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d9c2a16a149c69f5a39b9fbc4ec92a09631a713c711d93fed867a38b3fcda93 +size 60513 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser.png new file mode 100644 index 0000000000..1ebe59347e --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6073abcfe24ee30ae2bc07ac124e51799bbf7233d0533f7624aeb5fa53a4367d +size 41591 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png new file mode 100644 index 0000000000..0701015fc3 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12d5e077f5a534e6addb59256749354f5568a875302bbc17ef01c713b851ba7f +size 40927 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user.png new file mode 100644 index 0000000000..30351a385b --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e802d83a1252c3d8208371563293f9019b9b3c80418f3e71f1b3d6449f900b72 +size 40504 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png new file mode 100644 index 0000000000..b30e7fbffe --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1efcc7ef4fb4b9c6b1e4fc072018b68db4405240b2443f2e5578faaf53e1091b +size 40036 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png b/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png new file mode 100644 index 0000000000..a310068f1e --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1015369551fefd1d1d6c02ffc6cc2c283dc9fab2934b4740c2e5b2ea70a58d07 +size 58749 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png b/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png new file mode 100644 index 0000000000..a310068f1e --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1015369551fefd1d1d6c02ffc6cc2c283dc9fab2934b4740c2e5b2ea70a58d07 +size 58749 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png b/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png new file mode 100644 index 0000000000..54668033ea --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b17183f64cb12053ffd03cb0af06c3a04b4869ac5121fce0022a8c2aba6b5e8b +size 58902 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png new file mode 100644 index 0000000000..90d6808f55 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bdbbd347a480de157a356989b4120996c63e3ff52fd880feca50a320b9ea7cc +size 68042 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png new file mode 100644 index 0000000000..90d6808f55 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bdbbd347a480de157a356989b4120996c63e3ff52fd880feca50a320b9ea7cc +size 68042 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png new file mode 100644 index 0000000000..5453092aa8 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c327de86da1d791e6ee45696623806de7008451d0aaa7d4adb73dfa254c9e0c0 +size 47804 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png new file mode 100644 index 0000000000..72fa3aab47 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de5a65a95c03e83831231ba5bd5d2a891f8502220dd83312c02c7f618b733361 +size 69415 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png new file mode 100644 index 0000000000..e1eaf7ec8d --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79ad5b16c1b840f853199d5a6580f7096bfceb11c03169a21c0950565a2c93fd +size 70296 diff --git a/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png new file mode 100644 index 0000000000..6b71115837 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d0e0e5631cf9647253c48beec28282d47c3a4af271ec49696ce82bae072822c +size 50165 diff --git a/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png b/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png new file mode 100644 index 0000000000..1cdeaed41f --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdca8506b9fe7ddd1fc5dffaf651f4b2a08fd73d2b82981d9421525cdf60fb3b +size 74190 diff --git a/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png b/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png new file mode 100644 index 0000000000..6b93808648 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f597ca665ae22b315ff592ea86c2da57b483586941a085dd6e96db8383769444 +size 80834 diff --git a/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png b/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png new file mode 100644 index 0000000000..500196cfb4 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6df609ba58f749ddd01e10b92df0fc73410907f3b2ce4473dc16493d35f43552 +size 17178 diff --git a/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png b/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png new file mode 100644 index 0000000000..db86de03cc --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea6e9267c01a185178e4e99f3ee4da94e69e56376d7372e618fb144238f63763 +size 52494 diff --git a/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png b/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png new file mode 100644 index 0000000000..6efcbbf06b --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81007a5c45c3778ce3873814d6a89c1e3e5f4582b24221408a7f1fcc03257c66 +size 987671 diff --git a/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png b/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png new file mode 100644 index 0000000000..a26bb41cc3 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f3d5b57078a2fc4f9eff69e6562dba1e3f9b88728b5edb9172f81bf2889b846 +size 1012645 diff --git a/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png b/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png new file mode 100644 index 0000000000..62e8cf7bea --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2d0a30b1a7d67673fece45bc664f46c188ca27b1c1b6bd92cf1a0e5b377d6ec +size 19257 diff --git a/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png b/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png new file mode 100644 index 0000000000..073f732aae --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f86cb3daefbf5b9a30a4632ef9246c5b2b41fdee4f83cc8d093e0c2a7a42678f +size 1003216 diff --git a/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png b/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png new file mode 100644 index 0000000000..31446ff085 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aaebbf81af29fb9d7445df16938460504202430053dc6b243257c9b4dfe64811 +size 17625 diff --git a/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png b/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png new file mode 100644 index 0000000000..1f3c2fb252 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa681ee188f0be2bc5b2b27df6a6f039ec18d3d76e3b3c17165d29669e92e916 +size 997521 diff --git a/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png b/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png new file mode 100644 index 0000000000..d135e1127d --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2599021aef3e9d6f2cca6166a095146a07fc72768cbe33910042cbb05cf764b +size 1007231 diff --git a/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png b/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png new file mode 100644 index 0000000000..74b8aa9e5c --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6044dafcf676224f14994abac215db06862354a60d0ad8fc20778fa8247f26bb +size 186406 diff --git a/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png b/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png new file mode 100644 index 0000000000..bd6b4293fd --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:884501a947c6780adc56dca08c17f7369844835c8fc28106e52ef37183e9ba3d +size 186005 diff --git a/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png b/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png new file mode 100644 index 0000000000..c88a30b7c4 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20cd616e23f508c1fa678c6a7de1b29d3b552b475db8e97f79f32b29c85791c1 +size 163098 diff --git a/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png b/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png new file mode 100644 index 0000000000..10daf00c64 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d34f5ac92c5efff376a6008f6359c323aec2931cb2a61157a1a820f750dd49d0 +size 33517 diff --git a/tests/UI/expected-screenshots/Marketplace_updates_superuser.png b/tests/UI/expected-screenshots/Marketplace_updates_superuser.png new file mode 100644 index 0000000000..e37583dfb5 --- /dev/null +++ b/tests/UI/expected-screenshots/Marketplace_updates_superuser.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d9b0afeb3d48d6ba34ce8e6f56405161e3ad134d19a64da3367b92452d7cc40 +size 32907 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 9c9dce3051..dd0803cef4 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:476f0dd0c90b946c9cd3fd7769a3140d235cea598d20673c72884aba378cde9b -size 349850 +oid sha256:ad0a3bc714dc7d013f2689e8d4b98ca9273cfcbd6e30756c702a2a76c9a550f3 +size 532284 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index af51f6365c..1bcfab0c77 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b6a90fde9010211ea01953fd8ba870c22d663b62fff1bb8331d0ed8ac5b2173 -size 3460616 +oid sha256:b3a90f8c6b3cd5e51c0af063de6a5c2968146d2fd16f323740eb849b0ea715d4 +size 3480547 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index 13b87a2026..5d80d181cc 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92e8926494823dcbcc6b944ef4828b4dc02131cc42d6451e55db9ef2d524a2fe -size 116898 +oid sha256:cadbcc587c3a1099ab121a4d0a08e0cfaa57f8c6b2822f8833a253cdc0163cba +size 113505 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index d4f4e56103..3270c941e4 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63e3ed59831496b0679f6c08f08c75c598d6a6991823a183473817da7e976b0b -size 933080 +oid sha256:82d99d54325c7b0335a78d3715770e61937f6c9157dcb8d2f4c79a48af1424ff +size 933835 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png index dad4ec975c..59120fe451 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84e59ce08370286d50e24f3446509365786a254846a91affa418566f48d005a9 -size 74942 +oid sha256:f8713d9dca666ac6f2532cc3dee5a4b30bd5e8f3a6fa3181d6b9005c87e2c9b2 +size 80901 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png index 9eb0c90cc9..420fc0f714 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ed26d862dbc303fe4b282f4af325cb70d689e115a4487f8dc64882f109b8edf -size 4115881 +oid sha256:0a531c7f19980d3952e511ca54f17c95f38e04dc15f95a3dccb5e14ae09e0450 +size 4138237 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index 96a7c7324a..1b0a7c87e4 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a85aa6b5ef60f42ec6f719f44c64d574d7eb7677a4f79166306fb713efa2accf -size 300657 +oid sha256:0286e06276f123c5e120de3b08779dcff874ef873507d99d89185fb690fd53cf +size 479766 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index f0495e85bc..6a6af904d6 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a140a97e21b4c77617eed57fb924605adabf6ca750563ee478bcdcf50a872eb7 -size 1457388 +oid sha256:33eb54cef59315a69aae32573c55261044e5352b0616f3477ac61d14343c2a1d +size 1445972 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png index cb8cbe4265..80b9e7c5a5 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ca95a4d415379e0946e569adf4a388602809d379062f62ebc571e56daebe513 -size 488891 +oid sha256:66a8770070d0ed3acf91ff1c5538b6c702dcb351a23b0da2624f3f0157ff5cb9 +size 486648 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png index 2d7732163e..eaf22538af 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be0fb31f6a219012173cf497a22afc4e0e327348a371a12c67b510769f3f2a3f -size 179937 +oid sha256:b013eab8d4b17be33b9d3c956531b72bf5d931e27fa3a459d44a6af45b92a77c +size 179766 diff --git a/tests/UI/specs/Marketplace_spec.js b/tests/UI/specs/Marketplace_spec.js new file mode 100644 index 0000000000..dab2e3a5e6 --- /dev/null +++ b/tests/UI/specs/Marketplace_spec.js @@ -0,0 +1,265 @@ +/*! + * Piwik - free/libre analytics platform + * + * Screenshot tests for main, top and admin menus. + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +describe("Marketplace", function () { + this.timeout(0); + + this.fixture = "Piwik\\Plugins\\Marketplace\\tests\\Fixtures\\SimpleFixtureTrackFewVisits"; + + var urlBase = '?module=Marketplace&action=overview&'; + var paidPluginsUrl = urlBase + 'show=premium'; + var themesUrl = urlBase + 'show=themes'; + var pluginsUrl = urlBase; + + var noLicense = 'noLicense'; + var expiredLicense = 'expiredLicense'; + var exceededLicense = 'exceededLicense'; + var validLicense = 'validLicense'; + + function loadPluginDetailPage(page, pluginName, isFreePlugin) + { + page.load(isFreePlugin ? pluginsUrl : paidPluginsUrl); + page.click('.card-title [piwik-plugin-name="' + pluginName + '"]'); + } + + function captureSelector(done, screenshotName, test, selector) + { + expect.screenshot(screenshotName).to.be.captureSelector(selector, test, done); + } + + function captureMarketplace(done, screenshotName, test, selector) + { + if (!selector) { + selector = ''; + } + + captureSelector(done, screenshotName, test, '.marketplace' + selector); + } + + function captureWithNotification(done, screenshotName, test) + { + captureMarketplace(done, screenshotName, test, ',#notificationContainer'); + } + + function captureWithDialog(done, screenshotName, test) + { + captureSelector(done, screenshotName, test, '.ui-dialog:visible'); + } + + function assumePaidPluginsActivated() + { + testEnvironment.mockMarketplaceAssumePluginNamesActivated = ['CustomPlugin1','CustomPlugin2','PaidPlugin1','PaidPlugin2']; + testEnvironment.save(); + } + + function setEnvironment(mode, consumer) + { + if (mode === 'user') { + testEnvironment.idSitesViewAccess = [1]; + } else { + // superuser + testEnvironment.idSitesViewAccess = []; + } + + if (mode === 'multiUserEnvironment') { + testEnvironment.overrideConfig('General', 'multi_server_environment', '1'); + } else { + testEnvironment.overrideConfig('General', 'multi_server_environment', '0'); + } + + testEnvironment.overrideConfig('General', 'enable_plugins_admin', '1'); + + delete testEnvironment.mockMarketplaceAssumePluginNamesActivated; + + testEnvironment.consumer = consumer; + testEnvironment.mockMarketplaceApiService = 1; + testEnvironment.save(); + } + + ['superuser', 'user', 'multiUserEnvironment'].forEach(function (mode) { + + if (mode !== 'user') { + it('should show available updates in plugins page', function (done) { + setEnvironment(mode, noLicense); + + captureSelector(done, 'updates_' + mode, function (page) { + page.load('?module=CorePluginsAdmin&action=plugins&idSite=1&period=day&date=yesterday&activated='); + }, '#content .card:first'); + }); + } + + it(mode + ' for a user without license key should be able to open paid plugins', function (done) { + setEnvironment(mode, noLicense); + + captureMarketplace(done, 'paid_plugins_no_license_' + mode, function (page) { + page.load(paidPluginsUrl); + }); + }); + + it(mode + ' for a user with license key should be able to open paid plugins', function (done) { + setEnvironment(mode, validLicense); + + captureMarketplace(done, 'paid_plugins_with_license_' + mode, function (page) { + page.load(paidPluginsUrl); + }); + }); + + it(mode + ' for a user with exceeded license key should be able to open paid plugins', function (done) { + setEnvironment(mode, exceededLicense); + assumePaidPluginsActivated(); + + captureMarketplace(done, 'paid_plugins_with_exceeded_license_' + mode, function (page) { + page.load(paidPluginsUrl); + }); + }); + + it('should show themes page', function (done) { + setEnvironment(mode, validLicense); + + captureMarketplace(done, 'themes_with_valid_license_' + mode, function (page) { + page.load(themesUrl); + }); + }); + + it('should show free plugin details', function (done) { + setEnvironment(mode, noLicense); + + captureWithDialog(done, 'free_plugin_details_' + mode, function (page) { + var isFree = true; + loadPluginDetailPage(page, 'TreemapVisualization', isFree); + }); + }); + + it('should show paid plugin details when having no license', function (done) { + setEnvironment(mode, noLicense); + + captureWithDialog(done, 'paid_plugin_details_no_license_' + mode, function (page) { + assumePaidPluginsActivated(); + var isFree = false; + loadPluginDetailPage(page, 'PaidPlugin1', isFree); + }); + }); + + it('should show paid plugin details when having valid license', function (done) { + setEnvironment(mode, validLicense); + + captureWithDialog(done, 'paid_plugin_details_valid_license_' + mode + '_installed', function (page) { + assumePaidPluginsActivated(); + var isFree = false; + loadPluginDetailPage(page, 'PaidPlugin1', isFree); + }); + }); + + it('should show paid plugin details when having valid license', function (done) { + setEnvironment(mode, exceededLicense); + + captureWithDialog(done, 'paid_plugin_details_exceeded_license_' + mode, function (page) { + assumePaidPluginsActivated(); + var isFree = false; + loadPluginDetailPage(page, 'PaidPlugin1', isFree); + }); + }); + }); + + var mode = 'superuser'; + + it('should show a dialog showing a list of all possible plugins to install', function (done) { + setEnvironment(mode, validLicense); + + captureSelector(done, mode + '_install_all_paid_plugins_at_once', function (page) { + page.load(pluginsUrl); + page.click('.installAllPaidPlugins'); + }, '.modal.open'); + }); + + it('should show an error message when invalid license key entered', function (done) { + setEnvironment(mode, noLicense); + + captureWithNotification(done, mode + '_invalid_license_key_entered', function (page) { + page.load(pluginsUrl); + page.sendKeys('#license_key', 'invalid'); + page.click('.marketplace-paid-intro'); // click outside so change event is triggered + page.click('#submit_license_key input'); + }); + }); + + it('should show a confirmation before removing a license key', function (done) { + setEnvironment(mode, validLicense); + + captureSelector(done, mode + '_remove_license_key_confirmation', function (page) { + page.load(pluginsUrl); + page.click('#remove_license_key input'); + }, '.modal.open'); + }); + + it('should show a confirmation before removing a license key', function (done) { + setEnvironment(mode, noLicense); + + captureMarketplace(done, mode + '_remove_license_key_confirmed', function (page) { + page.click('.modal.open .modal-footer a:contains(Yes)') + }); + }); + + it('should show a success message when valid license key entered', function (done) { + setEnvironment(mode, noLicense); + + captureMarketplace(done, mode + '_valid_license_key_entered', function (page) { + page.load(pluginsUrl); + page.sendKeys('#license_key', 'valid'); + page.execCallback(function () { + setEnvironment(mode, validLicense); + }); + page.click('#submit_license_key input'); + }); + }); + + it('should hide activate / deactivate buttons if plugins admin is disabled', function (done) { + setEnvironment(mode, noLicense); + testEnvironment.overrideConfig('General', 'enable_plugins_admin', '0'); + testEnvironment.save(); + + captureMarketplace(done, mode + '_enable_plugins_admin', function (page) { + page.load(pluginsUrl); + }); + }); + + it('should hide activate / deactivate buttons if plugins admin is disabled when also multi server environment is enabled', function (done) { + setEnvironment('multiUserEnvironment', noLicense); + testEnvironment.overrideConfig('General', 'enable_plugins_admin', '0'); + testEnvironment.save(); + + captureMarketplace(done, mode + '_enable_plugins_admin_with_multiserver_enabled', function (page) { + page.load(pluginsUrl); + }); + }); + + [expiredLicense, exceededLicense, validLicense, noLicense].forEach(function (consumer) { + it('should show a subscription overview for ' + consumer, function (done) { + setEnvironment('superuser', consumer); + + captureSelector(done, 'subscription_overview_' + consumer, function (page) { + page.load('?module=Marketplace&action=subscriptionOverview'); + }, '#content'); + }); + }); + + [noLicense, expiredLicense, exceededLicense].forEach(function (consumer) { + // when there is no license it should not show a warning! as it could be due to network problems etc + it('should show a warning if license is ' + consumer, function (done) { + setEnvironment('superuser', consumer); + + assumePaidPluginsActivated(); + + captureSelector(done, 'notification_plugincheck_' + consumer, function (page) { + page.load('?module=UsersManager&action=index'); + }, '#notificationContainer'); + }); + }); + +});
\ No newline at end of file diff --git a/tests/lib/screenshot-testing/support/page-renderer.js b/tests/lib/screenshot-testing/support/page-renderer.js index 1551a68511..fe83cffcbc 100644 --- a/tests/lib/screenshot-testing/support/page-renderer.js +++ b/tests/lib/screenshot-testing/support/page-renderer.js @@ -110,6 +110,8 @@ PageRenderer.prototype.evaluate = function (impl, waitTime) { this.queuedEvents.push([this._evaluate, waitTime, impl]); }; +// like .evaluate() but doesn't call `impl` in context of the webpage. Useful if you want to change eg a testEnvironment +// before a click. Makes sure this callback `impl` will be executed just before the next action instead of immediately PageRenderer.prototype.execCallback = function (callback, waitTime) { this.queuedEvents.push([this._execCallback, waitTime, callback]); }; |
