@duckduckgo/autoconsent 16.59.0 → 16.61.0

package/Jenkinsfile

@@ -15,6 +15,30 @@ def runPlaywrightTests(resultDir, browser, testFiles) {
     }
 }
 
+// Rerun the tests that the local pass listed as blocked by a bot wall, one Oxylabs session at a time.
+def runOxylabsTests(candidatesFile, testFiles) {
+    def junitFile = "results-${env.REGION}-oxylabs.xml"
+    try {
+        // Playwright's --global-timeout ends the run first, so it still writes the JUnit XML
+        timeout(60) {
+            def testFilesArg = testFiles.join(' ')
+            withCredentials([usernamePassword(credentialsId: 'autoconsent-oxylabs', usernameVariable: 'OXYLABS_USER', passwordVariable: 'OXYLABS_PASSWORD')]) {
+                sh """
+                    OXYLABS=1 OXYLABS_CANDIDATES=${candidatesFile} PLAYWRIGHT_JUNIT_OUTPUT_NAME=${junitFile} npx playwright test ${testFilesArg} --project chrome --workers 1 --retries 1 --global-timeout 3300000 --reporter=junit,line || true
+                """
+            }
+        }
+    } catch (e) {
+        // e.g. missing credentials: keep the local results instead of failing the build
+        echo "Oxylabs pass failed: ${e}"
+    } finally {
+        def summary = junit skipMarkingBuildUnstable: true, skipPublishingChecks: true, allowEmptyResults: true, testResults: junitFile
+        archiveArtifacts artifacts: "test-results/screenshots/oxylabs/**/*.jpg", fingerprint: true, allowEmptyArchive: true
+        archiveArtifacts artifacts: junitFile, fingerprint: true, allowEmptyArchive: true
+        return summary
+    }
+}
+
 def withEnvFile(envfile, Closure cb) {
     def props = readProperties(file: envfile)
     withEnv(props.collect{ entry -> "${entry.key}=${entry.value}" }) {
@@ -119,9 +143,20 @@ pipeline {
                         ]
                         for (testEnv in testEnvs) {
                             withEnvFile(testEnv) {
-                                def summary = runPlaywrightTests(params.TEST_RESULT_ROOT, params.BROWSER, testsToRun)
+                                def candidatesFile = "${env.WORKSPACE}/oxylabs-candidates-${env.REGION}.txt"
+                                sh "rm -f '${candidatesFile}'"
+                                def summary
+                                withEnv(["OXYLABS_CANDIDATES=${candidatesFile}"]) {
+                                    summary = runPlaywrightTests(params.TEST_RESULT_ROOT, params.BROWSER, testsToRun)
+                                }
                                 testsFailed += summary.failCount
                                 testsTotal += summary.totalCount
+                                // Oxylabs browsers are Chromium only
+                                if (params.BROWSER == 'chrome' && fileExists(candidatesFile)) {
+                                    def oxylabsSummary = runOxylabsTests(candidatesFile, testsToRun)
+                                    // a test that passes on Oxylabs no longer counts as failed
+                                    testsFailed -= oxylabsSummary.passCount
+                                }
                             }
                         }
                     }

package/dist/addon-firefox/background.bundle.js

@@ -119,6 +119,27 @@
     EVAL_COOKIEFIRST_1: () => document.querySelectorAll("button[data-cookiefirst-accent-color=true][role=checkbox]:not([disabled])").forEach((i) => i.getAttribute("aria-checked") === "true" && i.click()) || true,
     EVAL_COOKIEINFORMATION_0: () => CookieInformation.declineAllCategories() || true,
     EVAL_COOKIEINFORMATION_1: () => CookieInformation.submitAllCategories() || true,
+    // banner button order and meaning are configurable per site, so set the consent levels through the public API
+    EVAL_COOKIEREPORTS_OPT_OUT: () => {
+      const cr = window._cookiereports;
+      if (typeof cr?.saveConsent !== "function") return false;
+      cr.saveConsent({ 1: true, 2: false, 3: false, 4: false, 5: false });
+      cr.processConsent("banner", { trigger: "ok" });
+      cr.hideBanner();
+      return true;
+    },
+    EVAL_COOKIEREPORTS_OPT_IN: () => {
+      const cr = window._cookiereports;
+      if (typeof cr?.saveConsent !== "function") return false;
+      cr.saveConsent({ 1: true, 2: true, 3: true, 4: true, 5: true });
+      cr.processConsent("banner", { trigger: "ok" });
+      cr.hideBanner();
+      return true;
+    },
+    EVAL_COOKIEREPORTS_TEST: () => {
+      const levels = window._cookiereports?.loadConsent?.();
+      return !!levels && Object.keys(levels).length > 0 && Object.values(levels).every((v) => !v);
+    },
     // turn the single-button form into a decline submission, same fields as the CMP's own decline form
     EVAL_EE_CONSENT_DECLINE_0: () => document.querySelectorAll('#cookieConsentFormAccept input[name^="ee:cookies_"]').forEach((i) => i.value = "n") || true,
     EVAL_ETSY_0: () => document.querySelectorAll(".gdpr-overlay-body input").forEach((toggle) => {