Fix Ketch and eu-cookie-compliance (#351)

* Improve the Ketch rule * Better handle `if` without `else` * Improve eu-cookie-compliance rule * Address PR comments
duckduckgo · Jan 31, 2024 · 342087b · 342087b
1 parent e90e456
commit 342087b
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 26 deletions.
diff --git a/lib/cmps/base.ts b/lib/cmps/base.ts
@@ -241,7 +241,7 @@ export class AutoConsentCMP extends AutoConsentCMPBase {
   }
 
   async evaluateRuleStep(rule: AutoConsentRuleStep) {
-    const results = [];
+    const results: Array<Promise<boolean> | boolean> = [];
     const logsConfig = this.autoconsent.config.logs;
     if (rule.exists) {
       results.push(this.elementExists(rule.exists));
@@ -282,6 +282,8 @@ export class AutoConsentCMP extends AutoConsentCMPBase {
         results.push(this._runRulesSequentially(rule.then));
       } else if (rule.else) {
         results.push(this._runRulesSequentially(rule.else));
+      } else {
+        results.push(true);
       }
     }
     if (rule.any) {

diff --git a/rules/autoconsent/eu-cookie-compliance.json b/rules/autoconsent/eu-cookie-compliance.json
@@ -1,10 +1,17 @@
 {
   "name": "eu-cookie-compliance-banner",
-  "detectCmp": [{ "exists": ".eu-cookie-compliance-banner-info" }],
-  "detectPopup": [{ "exists": ".eu-cookie-compliance-popup-open" }],
+  "detectCmp": [{ "exists": "body.eu-cookie-compliance-popup-open" }],
+  "detectPopup": [{ "exists": "body.eu-cookie-compliance-popup-open" }],
   "optIn": [{ "click": ".agree-button" }],
   "optOut": [
-    { "click": ".decline-button,.eu-cookie-compliance-save-preferences-button", "optional": true },
+    {
+      "if": {
+        "visible": ".decline-button,.eu-cookie-compliance-save-preferences-button"
+      },
+      "then": [{
+        "click": ".decline-button,.eu-cookie-compliance-save-preferences-button"
+      }]
+    },
     { "hide": ".eu-cookie-compliance-banner-info, #sliding-popup" }
   ],
   "test": [

diff --git a/rules/autoconsent/ketch.json b/rules/autoconsent/ketch.json
@@ -1,5 +1,6 @@
 {
   "name": "ketch",
+  "vendorUrl": "https://www.ketch.com",
   "runContext": {
     "frame": false,
     "main": true
@@ -24,37 +25,39 @@
         "exists": "#lanyard_root button[class='confirmButton']"
       },
       "then": [
-       { "waitForThenClick":"#lanyard_root div[class^='buttons'] > :nth-child(2)" },
+       { "waitForThenClick":"#lanyard_root div[class*=buttons] > :nth-child(2)" },
        { "click": "#lanyard_root button[class='confirmButton']" }
       ],
       "else": [
-        { "waitForThenClick":"#lanyard_root div[class^='buttons'] > :nth-child(2)" }
+        { "waitForThenClick":"#lanyard_root div[class*=buttons] > :nth-child(2)" }
       ]
     }
   ],
   "optOut": [
-    { 
-      "click": "#lanyard_root button[class^='link']",
+    {
+      "if": {
+        "exists": "#lanyard_root [aria-describedby=banner-description]"
+      },
+      "then": [
+        {
+          "waitForThenClick":"#lanyard_root div[class*=buttons] > button[class*=secondaryButton]",
+          "comment": "can be either settings or reject button"
+        }
+      ]
+    },
+    {
+      "waitFor": "#lanyard_root [aria-describedby=preference-description],#lanyard_root [aria-describedby=modal-description]",
+      "timeout": 1000,
       "optional": true
     },
     {
       "if": {
-        "exists": "#lanyard_root button[class*='confirmButton']"
-      },  
+        "exists": "#lanyard_root [aria-describedby=preference-description],#lanyard_root [aria-describedby=modal-description]"
+      },
       "then": [
-        { "waitForThenClick": "#lanyard_root button[class*='rejectButton']" },
-        { "click": "#lanyard_root button[class*='confirmButton']" }     
-      ],
-      "else": [
-        {
-          "click": "#lanyard_root div[class^='buttons'] > :nth-child(1)",
-          "optional": true
-        },
-        { "waitForThenClick": "#lanyard_root input:checked" },
-        { "click": "#consentsTab > div:nth-child(2) > div > div[class^='actions'] > button:nth-child(1)" }
+        { "waitForThenClick": "#lanyard_root button[class*=rejectButton]" },
+        { "click": "#lanyard_root button[class*=confirmButton],#lanyard_root div[class*=actions_] > button:nth-child(1)" }
       ]
     }
-  ],
-  "test": []
-  }
-
+  ]
+}
diff --git a/tests/eu-cookie-compliance-banner.spec.ts b/tests/eu-cookie-compliance-banner.spec.ts
@@ -1,6 +1,6 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('eu-cookie-compliance-banner', [
-  'https://www.bauwion.de/',
+  'https://www.theposh.com/table/226',
   'https://publichealth.jhu.edu/',
 ]);
diff --git a/tests/ketch.spec.ts b/tests/ketch.spec.ts
@@ -3,5 +3,5 @@ import generateCMPTests from "../playwright/runner";
 generateCMPTests("ketch", [
   "https://www.smartsheet.com/",
   "https://www.ketch.com/",
-  "https://www.patreon.com/",
+  "https://www.forbes.com/",
 ]);