@duckduckgo/autoconsent 3.0.1 → 3.0.2

package/playwright/runner.ts

@@ -15,6 +15,7 @@ type TestOptions = {
   skipRegions?: string[];
   onlyRegions?: string[];
   mobile: boolean;
+  expectPopupOpen: boolean;
 };
 const defaultOptions: TestOptions = {
   testOptOut: true,
@@ -23,6 +24,7 @@ const defaultOptions: TestOptions = {
   skipRegions: [],
   onlyRegions: [],
   mobile: false,
+  expectPopupOpen: true,
 };
 
 const contentScript = fs.readFileSync(
@@ -120,23 +122,28 @@ export function generateTest(
       page.on("framenavigated", injectContentScript);
 
       // wait for all messages and assertions
-      await waitFor(() => isMessageReceived({ type: "popupFound", cmp: expectedCmp }), 50, 500);
-      expect(isMessageReceived({ type: "popupFound", cmp: expectedCmp })).toBe(true);
+      await waitFor(() => isMessageReceived({ type: "cmpDetected", cmp: expectedCmp }), 50, 500);
+      expect(isMessageReceived({ type: "cmpDetected", cmp: expectedCmp })).toBe(true);
 
-      if (autoAction === 'optOut') {
-        await waitFor(() => isMessageReceived({ type: "optOutResult", result: true }), 50, 300);
-        expect(isMessageReceived({ type: "optOutResult", result: true })).toBe(true);
-      }
-      if (autoAction === 'optIn') {
-        await waitFor(() => isMessageReceived({ type: "optInResult", result: true }), 50, 300);
-        expect(isMessageReceived({ type: "optInResult", result: true })).toBe(true);
-      }
-      if (options.testSelfTest && selfTestFrame) {
-        await waitFor(() => isMessageReceived({ type: "selfTestResult", result: true }), 50, 300);
-        expect(isMessageReceived({ type: "selfTestResult", result: true })).toBe(true);
+      await waitFor(() => isMessageReceived({ type: "popupFound", cmp: expectedCmp }), options.expectPopupOpen ? 50 : 5, 500);
+      expect(isMessageReceived({ type: "popupFound", cmp: expectedCmp })).toBe(options.expectPopupOpen);
+
+      if (options.expectPopupOpen) {
+        if (autoAction === 'optOut') {
+          await waitFor(() => isMessageReceived({ type: "optOutResult", result: true }), 50, 300);
+          expect(isMessageReceived({ type: "optOutResult", result: true })).toBe(true);
+        }
+        if (autoAction === 'optIn') {
+          await waitFor(() => isMessageReceived({ type: "optInResult", result: true }), 50, 300);
+          expect(isMessageReceived({ type: "optInResult", result: true })).toBe(true);
+        }
+        if (options.testSelfTest && selfTestFrame) {
+          await waitFor(() => isMessageReceived({ type: "selfTestResult", result: true }), 50, 300);
+          expect(isMessageReceived({ type: "selfTestResult", result: true })).toBe(true);
+        }
+        await waitFor(() => isMessageReceived({ type: "autoconsentDone" }), 10, 500);
+        expect(isMessageReceived({ type: "autoconsentDone" })).toBe(true);
       }
-      await waitFor(() => isMessageReceived({ type: "autoconsentDone" }), 10, 500);
-      expect(isMessageReceived({ type: "autoconsentDone" })).toBe(true);
 
       expect(isMessageReceived({ type: "autoconsentError" })).toBe(false);
     })

package/tests/sourcepoint.spec.ts

@@ -2,8 +2,6 @@ import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('Sourcepoint-frame', [
     'https://www.theguardian.com/',
-    'https://www.n-tv.de/',
-    'https://www.sueddeutsche.de/',
     'https://news.sky.com/',
 ]);
 
@@ -15,3 +13,16 @@ generateCMPTests('Sourcepoint-frame', [
 ], {
     skipRegions: ["US", "GB"],
 });
+
+generateCMPTests('Sourcepoint-frame', [
+    "https://www.sueddeutsche.de/",
+    "https://www.derstandard.at/",
+    "https://www.heise.de/",
+    'https://www.n-tv.de/',
+], {
+    skipRegions: ["US", "GB", "FR"],
+    expectPopupOpen: false,
+    testOptIn: false,
+    testOptOut: false,
+    testSelfTest: false,
+})

package/tests/asus.spec.ts

@@ -1,5 +0,0 @@
-import generateCMPTests from "../playwright/runner";
-
-generateCMPTests('asus', [
-    'https://www.asus.com/',
-]);