remove no longer needed tests and fixtures

matomo-org · Sep 18, 2023 · 9d31a2b · 9d31a2b
1 parent 19c90c8
commit 9d31a2b
Show file tree

Hide file tree

Showing 22 changed files with 41 additions and 408 deletions.
diff --git a/plugins/PrivacyManager/tests/UI/PrivacyManager_ConsentManager_spec.js b/plugins/PrivacyManager/tests/UI/PrivacyManager_ConsentManager_spec.js
@@ -10,13 +10,21 @@
 describe("PrivacyManager_ConsentManager", function () {
     this.timeout(0);
 
-    this.fixture = "Piwik\\Tests\\Fixtures\\EmptySiteWithSiteContentDetection";
+    this.fixture = "Piwik\\Tests\\Fixtures\\EmptySite";
 
     var generalParams = 'idSite=1&period=day&date=2017-01-02',
         urlBase = '?module=PrivacyManager&' + generalParams + '&action=';
 
     before(function () {
         testEnvironment.pluginsToLoad = ['PrivacyManager'];
+        testEnvironment.detectedContentDetections = ['Osano'];
+        testEnvironment.connectedConsentManagers = ['Osano'];
+        testEnvironment.save();
+    });
+
+    after(function () {
+        testEnvironment.detectedContentDetections = [];
+        testEnvironment.connectedConsentManagers = [];
         testEnvironment.save();
     });
 

diff --git a/plugins/SitesManager/SiteContentDetection/Matomo.php b/plugins/SitesManager/SiteContentDetection/Matomo.php
@@ -12,14 +12,12 @@
 
 use Piwik\API\Request;
 use Piwik\Common;
-use Piwik\Container\StaticContainer;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager;
 use Piwik\Plugins\CustomVariables\CustomVariables;
 use Piwik\Plugins\PrivacyManager\DoNotTrackHeaderChecker;
 use Piwik\Site;
 use Piwik\SiteContentDetector;
-use Piwik\Translation\Translator;
 use Piwik\Url;
 use Piwik\View;
 

diff --git a/plugins/Tour/tests/UI/Tour_ConsentManager_spec.js b/plugins/Tour/tests/UI/Tour_ConsentManager_spec.js
@@ -8,16 +8,23 @@
 describe("Tour_ConsentManager", function () {
     this.timeout(0);
 
-    this.fixture = "Piwik\\Tests\\Fixtures\\EmptySiteWithSiteContentDetection";
+    this.fixture = "Piwik\\Tests\\Fixtures\\EmptySite";
 
     var generalParams = 'idSite=1&period=day&date=2010-01-03',
         widgetizeParams = "module=Widgetize&action=iframe";
 
     var widgetUrl = "?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Tour&actionToWidgetize=getEngagement";
 
-
     before(async function () {
         testEnvironment.pluginsToLoad = ['Tour'];
+        testEnvironment.detectedContentDetections = ['Osano'];
+        testEnvironment.connectedConsentManagers = ['Osano'];
+        testEnvironment.save();
+    });
+
+    after(async function () {
+        testEnvironment.detectedContentDetections = [];
+        testEnvironment.connectedConsentManagers = [];
         testEnvironment.save();
     });
 

diff --git a/tests/PHPUnit/Fixtures/EmptySiteWithSiteContentDetection.php b/tests/PHPUnit/Fixtures/EmptySiteWithSiteContentDetection.php
diff --git a/tests/PHPUnit/Fixtures/EmptySiteWithSiteContentDetectionGA3.php b/tests/PHPUnit/Fixtures/EmptySiteWithSiteContentDetectionGA3.php
diff --git a/tests/PHPUnit/Fixtures/EmptySiteWithSiteContentDetectionGA4.php b/tests/PHPUnit/Fixtures/EmptySiteWithSiteContentDetectionGA4.php
diff --git a/tests/PHPUnit/Fixtures/EmptySiteWithSiteContentDetectionMergeNotification.php b/tests/PHPUnit/Fixtures/EmptySiteWithSiteContentDetectionMergeNotification.php
diff --git a/tests/PHPUnit/Fixtures/EmptySiteWithSiteContentDetectionMergeNotificationOnlyGA.php b/tests/PHPUnit/Fixtures/EmptySiteWithSiteContentDetectionMergeNotificationOnlyGA.php
diff --git a/tests/UI/expected-screenshots/EmptySite_ConsentManager_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_ConsentManager_emptySiteDashboard.png
diff --git a/tests/UI/expected-screenshots/EmptySite_GA3_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_GA3_emptySiteDashboard.png
diff --git a/tests/UI/expected-screenshots/EmptySite_GA4_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_GA4_emptySiteDashboard.png
diff --git a/...s/UI/expected-screenshots/EmptySite_MergedNotificationGA_emptySiteDashboard.png b/...s/UI/expected-screenshots/EmptySite_MergedNotificationGA_emptySiteDashboard.png
diff --git a/tests/UI/expected-screenshots/EmptySite_MergedNotification_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_MergedNotification_emptySiteDashboard.png
diff --git a/tests/UI/expected-screenshots/EmptySite_cloudflare.png b/tests/UI/expected-screenshots/EmptySite_cloudflare.png
diff --git a/tests/UI/expected-screenshots/EmptySite_detected_cloudflare.png b/tests/UI/expected-screenshots/EmptySite_detected_cloudflare.png
diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
diff --git a/tests/UI/specs/EmptySite_ConsentManager_spec.js b/tests/UI/specs/EmptySite_ConsentManager_spec.js