Reset fixture between suites

plugins/PrivacyManager/tests/UI/PrivacyManager_SiteSpecific_spec.js

@@ -13,11 +13,39 @@ describe("PrivacyManager_SiteSpecific", function () {
     var generalParams = 'idSite=1&period=day&date=2017-01-02',
         urlBase = '?module=SitesManager&' + generalParams + '&action=';
 
+    async function resetSiteSpecificPrivacySettings()
+    {
+        // Persisted UI test runs can reuse a dirty fixture, so make sure the site-specific
+        // privacy settings for the sites we touch always start from the baseline fixture state.
+        for (const idSiteSpecific of [1, 2]) {
+            await testEnvironment.callApi('PrivacyManager.setAnonymizeIpSettings', {
+                anonymizeIPEnable: false,
+                ipAddressMaskLength: 0,
+                useAnonymizedIpForVisitEnrichment: false,
+                anonymizeUserId: false,
+                anonymizeOrderId: false,
+                anonymizeReferrer: '',
+                forceCookielessTracking: false,
+                randomizeConfigId: false,
+                idSiteSpecific,
+                useSiteSpecificSettings: false,
+            });
+        }
+    }
+
     before(function () {
         testEnvironment.pluginsToLoad = ['PrivacyManager'];
         testEnvironment.save();
     });
 
+    before(async function () {
+        await resetSiteSpecificPrivacySettings();
+    });
+
+    after(async function () {
+        await resetSiteSpecificPrivacySettings();
+    });
+
     async function loadBasePage()
     {
         await page.goto(urlBase);

plugins/PrivacyManager/tests/UI/PrivacyManager_spec.js

@@ -13,11 +13,37 @@ describe("PrivacyManager", function () {
     var generalParams = 'idSite=1&period=day&date=2017-01-02',
         urlBase = '?module=PrivacyManager&' + generalParams + '&action=';
 
+    async function resetSiteSpecificPrivacySettings()
+    {
+        for (const idSiteSpecific of [1, 2]) {
+            await testEnvironment.callApi('PrivacyManager.setAnonymizeIpSettings', {
+                anonymizeIPEnable: false,
+                ipAddressMaskLength: 0,
+                useAnonymizedIpForVisitEnrichment: false,
+                anonymizeUserId: false,
+                anonymizeOrderId: false,
+                anonymizeReferrer: '',
+                forceCookielessTracking: false,
+                randomizeConfigId: false,
+                idSiteSpecific,
+                useSiteSpecificSettings: false,
+            });
+        }
+    }
+
     before(function () {
         testEnvironment.pluginsToLoad = ['PrivacyManager'];
         testEnvironment.save();
     });
 
+    before(async function () {
+        await resetSiteSpecificPrivacySettings();
+    });
+
+    after(async function () {
+        await resetSiteSpecificPrivacySettings();
+    });
+
     async function setAnonymizeStartEndDate()
     {
         // make sure tests do not fail every day