diff --git a/plugins/Marketplace/tests/Integration/PluginsTest.php b/plugins/Marketplace/tests/Integration/PluginsTest.php index 36d035bfbae..aa1fe2a6426 100644 --- a/plugins/Marketplace/tests/Integration/PluginsTest.php +++ b/plugins/Marketplace/tests/Integration/PluginsTest.php @@ -371,7 +371,7 @@ public function test_searchPlugins_manyPluginsFound_shouldEnrichAll() $this->service->returnFixture('v2.0_plugins.json'); $plugins = $this->plugins->searchPlugins($query = '', $sort = Sort::DEFAULT_SORT, $themesOnly = false); - $this->assertCount(54, $plugins); + $this->assertCount(47, $plugins); $names = array_map(function ($plugin) { return $plugin['name']; }, $plugins); @@ -485,7 +485,6 @@ private function getExpectedPluginNames() { return array ( 'AdminNotification', - 'AdvancedCampaignReporting', 'AnonymousPiwikUsageMeasurement', 'ApiGetWithSitesInfo', 'Bandwidth', @@ -496,14 +495,12 @@ private function getExpectedPluginNames() 'CustomAlerts', 'CustomDimensions', 'CustomOptOut', - 'CustomTrackerJs', 'ExcludeByDDNS', 'FeedAnnotation', 'FlagCounter', 'FreeMobileMessaging', 'GoogleAuthenticator', 'GrabGravatar', - 'InterSites', 'IntranetGeoIP', 'Ip2Hostname', 'IP2Location', @@ -519,7 +516,6 @@ private function getExpectedPluginNames() 'PaidPlugin1', 'PerformanceInfo', 'PerformanceMonitor', - 'PlatformsReport', 'QueuedTracking', 'ReferrersManager', 'RerUserDates', @@ -527,17 +523,14 @@ private function getExpectedPluginNames() 'ServerMonitor', 'ShibbolethLogin', 'ShortcodeTracker', - 'SimplePageBuilder', 'SimpleSysMon', - 'SiteMigration', 'SnoopyBehavioralScoring', 'TasksTimetable', 'TopPagesByActions', 'TrackingCodeCustomizer', 'TreemapVisualization', 'UptimeRobotMonitor', - 'VisitorAvatar', - 'WebsiteGroups' + 'VisitorAvatar' ); } } diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png index cdf9198e9b2..41d9d631af6 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b7c8a1eaed0ef1c37e46143cf0248a843f689eadb7d343dab452f0202845c7e -size 931422 +oid sha256:3000a27ba0656474f91d0469bcc0525972f1076fe6fa6bccd8aae90aa5d29130 +size 825055 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png index eee4d55df38..1d114cfcc85 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b3cbb8387bee4f2dcccae0816df96f008dffa320c958f975f63ca39764af0e0 -size 961347 +oid sha256:9b80f3e7360c6d56f0b04de3a28cc39dfef57a52c2de05a7050c84d36dc02d03 +size 850800 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png index 66d036abdab..9e7dc8d9b80 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:995398ff818e2ffd09976a587ea6e6b14d1e0a8bbb8dea474f7773a8b10ad9d4 -size 947600 +oid sha256:f67e86f4d5f0bb39d8d62964ce2b5bc4392b4ea24e6e98166d4aad77a9f587e8 +size 842446 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png index 58b09a33da0..8918ac39389 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b54c8f776f2c49a2cac212fde2a18c2e4c2ada824f987fb816d4cebc555b2448 -size 942151 +oid sha256:df8842c7383689b5caa2cd0fc15ebb713e4909db5b1db79ae87f23fd3ae6ee2d +size 838448 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png index 439f8127693..1b19c83f3c0 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbe61587a2af134c797c827030649a01235e620c082d0661fc9a475d56ecb9f3 -size 951302 +oid sha256:01ce5959eafb08ff882c4458ec7e4993ef9da53ec9e064920165c8645ba79658 +size 847430 diff --git a/plugins/Marketplace/tests/resources/v2.0_plugins.json b/plugins/Marketplace/tests/resources/v2.0_plugins.json index 0caa2e0fcaf..a006274726a 100644 --- a/plugins/Marketplace/tests/resources/v2.0_plugins.json +++ b/plugins/Marketplace/tests/resources/v2.0_plugins.json @@ -30,88 +30,7 @@ "readmeHtml":{"description":"\n\n

Adds the ability for Piwik administrators to include an informative message on all users' dashboards. This may be useful for communicating with users in larger shared environments. In our setup we were tracking 1,900 websites with 250 users. This is a solution we wrote to allow us to easily inform our users of maintainance windows.<\/p>\n\n", "faq":"", "documentation":"", - "changelog":"

0.1.2 Tested with Piwik v2.15 and included new registerEvents() hook for compatibility with Piwik 3.0\n0.1.1 Cleanup. Removed plugin template verbiage from code files.\n0.1.0 Initial Release<\/p>"},"download":"\/api\/2.0\/plugins\/AdminNotification\/download\/0.1.2"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/AdminNotification\/changelog"},"consumer":{"license":null}},{"name":"AdvancedCampaignReporting", - "displayName":"Advanced Campaign Reporting", - "owner":"PiwikPRO", - "description":"Track up to five Campaigns parameter (campaign, source, medium, keyword, content). Lets you also segment users by any campaign dimension, and provides", - "homepage":"http:\/\/piwik.pro", - "createdDateTime":"2014-10-01 03:22:04", - "donate":{},"support":[],"isTheme":false,"keywords":[],"basePrice":0,"authors":[],"repositoryUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting", - "lastUpdated":"2016-03-22 12:36:04", - "latestVersion":"1.3.1", - "numDownloads":8360,"screenshots":[],"previews":[],"activity":{"numCommits":"149", - "numContributors":"9", - "lastCommitDate":"2016-04-15 22:57:32"},"featured":false,"isFree":true,"isPaid":false,"isCustomPlugin":false,"shop":null,"versions":[{"name":"1.0.3", - "release":"2014-10-01 03:22:04", - "requires":{},"numDownloads":496,"license":{"name":"GPLv3+", - "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1", - "readmeHtml":{"description":"", - "faq":"", - "changelog":"", - "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.3"},{"name":"1.0.4", - "release":"2014-11-03 15:08:04", - "requires":{},"numDownloads":213,"license":{"name":"GPLv3+", - "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1", - "readmeHtml":{"description":"", - "faq":"", - "changelog":"", - "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.4"},{"name":"1.0.5", - "release":"2014-11-14 11:16:04", - "requires":{},"numDownloads":109,"license":{"name":"GPLv3+", - "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1", - "readmeHtml":{"description":"", - "faq":"", - "changelog":"", - "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.5"},{"name":"1.0.6", - "release":"2014-11-17 04:44:03", - "requires":{},"numDownloads":1531,"license":{"name":"GPLv3+", - "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1", - "readmeHtml":{"description":"", - "faq":"", - "changelog":"", - "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.6"},{"name":"1.0.7", - "release":"2015-03-31 20:50:04", - "requires":{},"numDownloads":9,"license":{"name":"GPLv3+", - "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1", - "readmeHtml":{"description":"", - "faq":"", - "changelog":"", - "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.7"},{"name":"1.0.8", - "release":"2015-03-31 21:20:04", - "requires":{},"numDownloads":1853,"license":{"name":"GPLv3+", - "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1", - "readmeHtml":{"description":"", - "faq":"", - "changelog":"", - "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.8"},{"name":"1.1.1", - "release":"2015-09-03 02:04:03", - "requires":{"piwik":">=2.14.0"},"numDownloads":954,"license":{"name":"GPLv3+", - "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1", - "readmeHtml":{"description":"", - "faq":"", - "changelog":"", - "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.1.1"},{"name":"1.2.0", - "release":"2015-11-11 13:08:02", - "requires":{"piwik":">=2.15.0"},"numDownloads":1743,"license":{"name":"GPLv3+", - "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/2.0.2", - "readmeHtml":{"description":"", - "faq":"", - "changelog":"", - "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.2.0"},{"name":"1.3.0", - "release":"2016-03-08 14:02:03", - "requires":{"piwik":">=2.16.0"},"numDownloads":352,"license":{"name":"GPLv3+", - "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1", - "readmeHtml":{"description":"", - "faq":"", - "changelog":"", - "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.3.0"},{"name":"1.3.1", - "release":"2016-03-22 12:36:04", - "requires":{"piwik":">=2.16.0"},"numDownloads":1100,"license":{"name":"GPLv3+", - "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1", - "readmeHtml":{"description":"\n\n

Track up to five Campaigns parameters (name, source, medium, keyword, content), and access Campaign Analytics reports.<\/p>\n\n

Measuring campaigns<\/h3>\n\n

The default Campaign parameters are called: pk_campaign, pk_source, pk_medium, pk_keyword, pk_content and pk_cid.<\/p>\n\n

If you already have URLs tagged with Google Analytics parameters these are supported: utm_campaign, utm_source, utm_medium, utm_term, utm_content and utm_id<\/p>\n\n

An example landing page URL is:<\/p>\n\n

\/offer?pk_campaign=Best-Seller&pk_source=Newsletter_7&pk_medium=email\n<\/code><\/pre>\n\n

Features<\/h3>\n\n