diff --git a/.gitmodules b/.gitmodules index a86f9ffe7f04d7d679e51218b985fea635a5f584..c5eaa0f84736734624e2671fdf3d5f815777535f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,7 +50,10 @@ path = plugins/LoginLdap url = https://github.com/piwik/plugin-LoginLdap.git branch = master - +[submodule "plugins/MarketingCampaignsReporting"] + path = plugins/MarketingCampaignsReporting + url = https://github.com/piwik/plugin-MarketingCampaignsReporting.git + branch = master # Add new Plugin submodule above this line ^^ # diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting new file mode 160000 index 0000000000000000000000000000000000000000..50c520eb9608b59c2e1abea09bbe70a553c834a8 --- /dev/null +++ b/plugins/MarketingCampaignsReporting @@ -0,0 +1 @@ +Subproject commit 50c520eb9608b59c2e1abea09bbe70a553c834a8 diff --git a/tests/PHPUnit/Framework/TestingEnvironmentVariables.php b/tests/PHPUnit/Framework/TestingEnvironmentVariables.php index 596daa82f2ad92d72966f6d3174d0da85b8f31b3..ef4b34449eaef1003af881b75bf78c2baefb1888 100644 --- a/tests/PHPUnit/Framework/TestingEnvironmentVariables.php +++ b/tests/PHPUnit/Framework/TestingEnvironmentVariables.php @@ -105,6 +105,7 @@ class TestingEnvironmentVariables $disabledPlugins = $pluginList->getCorePluginsDisabledByDefault(); $disabledPlugins[] = 'LoginHttpAuth'; $disabledPlugins[] = 'LoginLdap'; + $disabledPlugins[] = 'MarketingCampaignsReporting'; $disabledPlugins[] = 'ExampleVisualization'; $disabledPlugins = array_diff($disabledPlugins, array( diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 27f9d770e1fc14520c8213e103f5e0d3f4c17035..8636a11726dde3a0af6962cb4f25cfb4baee31fb 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png index df77d61967cf3ed2ba783d9fac75d19336f9f539..9e9d5b922305f556dcd1fa5f2b2b02e2f308149b 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png and b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png index 98ed0d33c2bb6893df3b8d126551646e8faef91a..0fc34b73489cae7178762a1e661a7c253159a383 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png and b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png differ