@duckduckgo/autoconsent 8.0.0 → 8.1.0

package/lib/cmps/cookiebot.ts

@@ -1,5 +1,4 @@
 import { click, elementExists, wait } from '../rule-executors';
-import { waitFor } from '../utils';
 import AutoConsentCMPBase from './base';
 
 export default class Cookiebot extends AutoConsentCMPBase {
@@ -23,9 +22,7 @@ export default class Cookiebot extends AutoConsentCMPBase {
   }
 
   async detectPopup() {
-    return await waitFor(() => {
-      return this.mainWorldEval('EVAL_COOKIEBOT_2')
-    }, 10, 500);
+    return this.mainWorldEval('EVAL_COOKIEBOT_2');
   }
 
   async optOut() {

package/lib/eval-snippets.ts

@@ -57,6 +57,7 @@ export const snippets = {
   EVAL_EZOIC_0: () => ezCMP.handleAcceptAllClick(),
   EVAL_EZOIC_1: () => !!document.cookie.match(/ezCMPCookieConsent=[^;]+\|2=0\|3=0\|4=0/),
   EVAL_GOOGLE_0: () => !!document.cookie.match(/SOCS=CAE/),
+  EVAL_HEMA_TEST_0: () => document.cookie.includes('cookies_rejected=1'),
   EVAL_IUBENDA_0: () => document.querySelectorAll('.purposes-item input[type=checkbox]:not([disabled])').forEach(x => {if(x.checked) x.click()}) || true,
   EVAL_IUBENDA_1: () => !!document.cookie.match(/_iub_cs-\d+=/),
   EVAL_IWINK_TEST: () => document.cookie.includes('cookie_permission_granted=no'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",
@@ -18,6 +18,7 @@
     "test:firefox": "playwright test --project firefox",
     "test:chrome": "playwright test --project chrome",
     "test:lib": "playwright test tests/rule-executors.spec.ts",
+    "test:sample": "playwright test tests/_sample-test.spec.ts --project webkit",
     "fetch-fanboy-list": "wget https://www.fanboy.co.nz/fanboy-cookiemonster.txt",
     "fetch-site-list": "curl https://s3.amazonaws.com/cdn.cliqz.com/re-consent/supported_sites.txt > sites.txt",
     "build-rules": "node rules/build.mjs",

package/playwright/runner.ts

@@ -7,6 +7,7 @@ import { enableLogs } from "../lib/config";
 import { AutoAction } from "../lib/types";
 
 const testRegion = (process.env.REGION || "NA").trim();
+test.describe.configure({ mode: 'parallel' });
 
 type TestOptions = {
   testOptOut: boolean;

package/playwright.config.ts

@@ -15,7 +15,6 @@ const config: PlaywrightTestConfig = {
       use: {
         ...devices['Desktop Safari'],
         proxy,
-        screenshot: 'only-on-failure',
         userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15',
       },
     },
@@ -24,7 +23,6 @@ const config: PlaywrightTestConfig = {
       use: {
         ...devices['iPhone SE'],
         proxy,
-        screenshot: 'only-on-failure',
         userAgent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Mobile/15E148 Safari/604.1',
       },
     },

package/rules/autoconsent/hema-com.json

@@ -0,0 +1,21 @@
+{
+  "name": "hema",
+  "prehideSelectors": [".cookie-modal"],
+  "detectCmp": [
+    { "visible": ".cookie-modal .cookie-accept-btn" }
+  ],
+  "detectPopup": [
+    { "visible": ".cookie-modal .cookie-accept-btn" }
+  ],
+  "optIn": [
+    { "waitForThenClick": ".cookie-modal .cookie-accept-btn" }
+  ],
+  "optOut": [
+    { "waitForThenClick": ".cookie-modal .js-cookie-reject-btn" }
+  ],
+  "test": [
+    {
+      "eval": "EVAL_HEMA_TEST_0"
+    }
+  ]
+}

package/rules/autoconsent/ing-de.json

@@ -0,0 +1,18 @@
+{
+  "name": "ing.de",
+  "runContext": {
+    "urlPattern": "^https://www\\.ing\\.de/"
+  },
+  "cosmetic": true,
+  "prehideSelectors": ["div[slot=\"backdrop\"]"],
+  "detectCmp": [{ "exists": "[data-tag-name=\"ing-cc-dialog-frame\"]" }],
+  "detectPopup": [{ "visible": "[data-tag-name=\"ing-cc-dialog-frame\"]" }],
+  "optIn": [{ "click": [
+    "[data-tag-name=\"ing-cc-dialog-level0\"]",
+    "[data-tag-name=\"ing-cc-button\"][class*=\"accept\"]"
+  ] }],
+  "optOut": [{ "click": [
+    "[data-tag-name=\"ing-cc-dialog-level0\"]",
+    "[data-tag-name=\"ing-cc-button\"][class*=\"more\"]"
+  ] }]
+}

package/rules/rules.json

@@ -2382,6 +2382,37 @@
         }
       ]
     },
+    {
+      "name": "hema",
+      "prehideSelectors": [
+        ".cookie-modal"
+      ],
+      "detectCmp": [
+        {
+          "visible": ".cookie-modal .cookie-accept-btn"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": ".cookie-modal .cookie-accept-btn"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": ".cookie-modal .cookie-accept-btn"
+        }
+      ],
+      "optOut": [
+        {
+          "waitForThenClick": ".cookie-modal .js-cookie-reject-btn"
+        }
+      ],
+      "test": [
+        {
+          "eval": "EVAL_HEMA_TEST_0"
+        }
+      ]
+    },
     {
       "name": "hl.co.uk",
       "prehideSelectors": [
@@ -2479,6 +2510,42 @@
         }
       ]
     },
+    {
+      "name": "ing.de",
+      "runContext": {
+        "urlPattern": "^https://www\\.ing\\.de/"
+      },
+      "cosmetic": true,
+      "prehideSelectors": [
+        "div[slot=\"backdrop\"]"
+      ],
+      "detectCmp": [
+        {
+          "exists": "[data-tag-name=\"ing-cc-dialog-frame\"]"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "[data-tag-name=\"ing-cc-dialog-frame\"]"
+        }
+      ],
+      "optIn": [
+        {
+          "click": [
+            "[data-tag-name=\"ing-cc-dialog-level0\"]",
+            "[data-tag-name=\"ing-cc-button\"][class*=\"accept\"]"
+          ]
+        }
+      ],
+      "optOut": [
+        {
+          "click": [
+            "[data-tag-name=\"ing-cc-dialog-level0\"]",
+            "[data-tag-name=\"ing-cc-button\"][class*=\"more\"]"
+          ]
+        }
+      ]
+    },
     {
       "name": "ionos.de",
       "prehideSelectors": [

package/tests/_sample-test.spec.ts

@@ -0,0 +1,16 @@
+import coverageData from "../data/coverage.json";
+import generateCMPTests from "../playwright/runner";
+
+const region = (process.env.REGION || "US").trim();
+const nSites = parseInt(process.env.NSITES || '1')
+
+Object.keys(coverageData).forEach((name) => {
+  if (!coverageData[name][region]) {
+    // no coverage in this region
+    return;
+  }
+  const siteList = coverageData[name][region].exampleSites.slice(0, nSites);
+  generateCMPTests(name, siteList, {
+    testOptIn: false,
+  });
+});

package/tests/hema.spec.ts

@@ -0,0 +1,7 @@
+import generateCMPTests from "../playwright/runner";
+
+generateCMPTests('hema', [
+  'https://hema.nl/',
+  'https://www.hema.com/de-de',
+], {
+});