Fix the Canonical rule (#345)

duckduckgo · Jan 26, 2024 · f3436e1 · f3436e1
1 parent b0ba99c
commit f3436e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/lib/eval-snippets.ts b/lib/eval-snippets.ts
@@ -107,7 +107,7 @@ export const snippets = {
   EVAL_THEFREEDICTIONARY_0: () => cmpUi.showPurposes() || cmpUi.rejectAll() || true,
   EVAL_THEFREEDICTIONARY_1: () => cmpUi.allowAll() || true,
   EVAL_THEVERGE_0: () => document.cookie.includes('_duet_gdpr_acknowledged=1'),
-  EVAL_UBUNTU_COM_0: () => document.cookie === '_cookies_accepted=essential',
+  EVAL_UBUNTU_COM_0: () => document.cookie.includes('_cookies_accepted=essential'),
   EVAL_UK_COOKIE_CONSENT_0: () => !document.cookie.includes('catAccCookies'),
   EVAL_USERCENTRICS_API_0: () => typeof UC_UI === 'object',
   EVAL_USERCENTRICS_API_1: () => !!UC_UI.closeCMP(),

diff --git a/rules/autoconsent/ubuntu.com.json b/rules/autoconsent/ubuntu.com.json
@@ -42,22 +42,23 @@
         {
             "any": [
                 {
-                    "waitForThenClick": "button.p-button"
+                    "waitForThenClick": "button.js-manage"
                 },
                 {
                     "waitForThenClick": "xpath///*[@id=\"cookie-policy-content\"]/p[4]/button[2]"
                 }
             ]
         },
         {
-            "waitForThenClick": ".p-switch__input:checked",
+            "waitForThenClick": "dialog.cookie-policy .p-switch__input:checked",
             "optional": true,
-            "all": true
+            "all": true,
+            "timeout": 500
         },
         {
             "any": [
                 {
-                    "waitForThenClick": "div > button"
+                    "waitForThenClick": "dialog.cookie-policy .js-save-preferences"
                 },
                 {
                     "waitForThenClick": "xpath///*[@id=\"modal\"]/div/button"

diff --git a/tests/ubuntu.spec.ts b/tests/ubuntu.spec.ts
@@ -2,4 +2,6 @@ import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('ubuntu.com', [
   'https://ubuntu.com/',
+  'https://canonical.com/',
+  'https://snapcraft.io/',
 ], {});