@duckduckgo/autoconsent 16.50.0 → 16.52.0

package/tests/tealium.spec.ts

@@ -11,4 +11,7 @@ generateCMPTests('Tealium', [
     'https://www.nito.no/',
     'https://www.about.hsbc.pl/pl-pl/hsbc-service-delivery',
     'https://www.hsbc.com/',
+    'https://www.telekom.de/',
+    'https://www.telekom.com/',
+    'https://www.t-systems.com/',
 ]);

package/tests/tempest-cookie-notice.spec.ts

@@ -0,0 +1,7 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests(
+    'tempest-cookie-notice',
+    ['https://www.visitpittsburgh.com/things-to-do/', 'https://www.visitspokane.com/', 'https://www.visitoverlandpark.com/'],
+    {},
+);

package/tests/termsfeed.spec.ts

@@ -4,4 +4,8 @@ generateCMPTests('termsfeed', [
     'https://ftbwiki.org/Feed_The_Beast_Wiki',
     'https://inspirationaladventures.com/',
     'http://www.campingplatz-suche.com/',
+    // freeprivacypolicy.com variant
+    'https://grovemade.com/',
+    'https://loot.farm/',
+    'https://tcdecks.net/',
 ]);

package/tests/therealest.spec.ts

@@ -0,0 +1,6 @@
+import generateCMPTests from '../playwright/runner';
+
+// saving preferences reloads the page when analytics was on by default (US), which interrupts the self-test
+generateCMPTests('therealest', ['https://mls.therealest.com/', 'https://therealest.com/'], {
+    testSelfTest: false,
+});

package/tests/tineye.spec.ts

@@ -0,0 +1,3 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests('tineye', ['https://tineye.com/']);

package/tests/tk-aerztefuehrer.de.spec.ts

@@ -0,0 +1,6 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests('tk-aerztefuehrer.de', ['https://www.tk-aerztefuehrer.de/TK/Suche_SN/index.js?a=FS1'], {
+    // the site reloads the page after saving the selection
+    testSelfTest: false,
+});

package/tests/tplink.spec.ts

@@ -1,3 +1,13 @@
 import generateCMPTests from '../playwright/runner';
 
-generateCMPTests('tplink', ['https://www.tp-link.com/nl/', 'https://www.tp-link.com/us/']);
+generateCMPTests('tplink', [
+    'https://www.tp-link.com/nl/',
+    'https://www.tp-link.com/us/',
+    'https://www.tp-link.com/us/home-networking/wifi-router/tl-wr3602be/',
+    'https://www.omadanetworks.com/us/',
+]);
+
+// opting out reloads the page, which interrupts the self-test
+generateCMPTests('tplink', ['https://www.kasasmart.com/us'], {
+    testSelfTest: false,
+});

package/tests/trust360.spec.ts

@@ -0,0 +1,8 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests('trust360', [
+    'https://www.sompo-japan.co.jp/webloan/',
+    'https://www.privtech.co.jp/',
+    'https://www.nipponsanso.com/',
+    'https://www.tn-sanso.co.jp/',
+]);

package/tests/up-cookie-consent.spec.ts

@@ -0,0 +1,9 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests('up-cookie-consent', [
+    'https://marrableshotel.com/',
+    'https://crimsonhotels.com/',
+    'https://www.thegrove.co.uk/',
+    'https://www.thegilpin.co.uk/',
+    'https://www.thehari.com/',
+]);

package/tests/uw-madison-cookieconsent.spec.ts

@@ -0,0 +1,7 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests('uw-madison-cookieconsent', [
+    'https://lafollette.wisc.edu/news/new-research-reveals-longevity-gains-slowing-life-expectancy-of-100-unlikely/',
+    'https://www.wisc.edu/',
+    'https://geography.wisc.edu/',
+]);

package/tests/vowels.spec.ts

@@ -0,0 +1,3 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests('vowels', ['https://vowels.net/', 'https://vowels.jp/']);

package/tests/web-rewind.com.spec.ts

@@ -0,0 +1,5 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests('web-rewind.com', ['https://web-rewind.com/'], {
+    testSelfTest: false,
+});

package/tests/wildling-com.spec.ts

@@ -0,0 +1,3 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests('wildling-com', ['https://wildling.com/']);

package/tests/worldbank.spec.ts

@@ -0,0 +1,7 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests('worldbank', [
+    'https://www.worldbank.org/en/programs/lsms/overview',
+    'https://www.devcommittee.org/',
+    'https://www.subsidydata.org/',
+]);

package/tests/yuntrack.spec.ts

@@ -0,0 +1,6 @@
+import generateCMPTests from '../playwright/runner';
+
+const urls = ['https://www.yuntrack.com/', 'https://m.yuntrack.com/'];
+
+generateCMPTests('yuntrack', urls, { mobile: true });
+generateCMPTests('yuntrack', urls, { mobile: false });

package/tests-wtr/dom-actions/dom-actions.click.ts

@@ -37,6 +37,24 @@ describe('click', () => {
         expect(clickCounter2).to.equal(1);
     });
 
+    it('lets the page handle each click before the next one when all=true', async () => {
+        const domActions = instantiateDomActions();
+        let firstClickHandled = false;
+        let firstClickHandledBeforeSecond = false;
+        const onFirst = () => setTimeout(() => (firstClickHandled = true), 0);
+        const onSecond = () => (firstClickHandledBeforeSecond = firstClickHandled);
+        document.querySelector('#first > button')?.addEventListener('click', onFirst);
+        document.querySelector('#second > button')?.addEventListener('click', onSecond);
+
+        try {
+            expect(await domActions.click('button', true)).true;
+            expect(firstClickHandledBeforeSecond).true;
+        } finally {
+            document.querySelector('#first > button')?.removeEventListener('click', onFirst);
+            document.querySelector('#second > button')?.removeEventListener('click', onSecond);
+        }
+    });
+
     it('clicks only first one upon multiple matches when all=false', async () => {
         const domActions = instantiateDomActions();
 

package/tests-wtr/heuristics/button-classification-accuracy.test.ts

@@ -1,5 +1,5 @@
 import { expect } from '@esm-bundle/chai';
-import { classifyButtonTextRegex } from '../../lib/heuristics';
+import { classifyButtonTextRegex } from '../../lib/heuristic-classify';
 import {
     BENCHMARK_LABELS,
     buildLabelBenchmarks,
@@ -23,14 +23,18 @@ describe('classifyButtonTextRegex against labelled button texts', () => {
         benchmarks = buildLabelBenchmarks(classifyRows(rows, classifyButtonTextRegex));
     });
 
-    BENCHMARK_LABELS.forEach((label, i) => {
+    const benchmarkFor = (label: string) => benchmarks.find((b) => b.label === label)!;
+
+    BENCHMARK_LABELS.forEach((label) => {
+        // includes rows labelled 'other', e.g. withdraw-consent or policy links that must not be clicked
         it(`never predicts "${label}" for a button labelled differently`, () => {
-            const examples = benchmarks[i].falsePositiveExamples.slice(0, 10).map(formatExample).join('\n      ');
-            expect(benchmarks[i].falsePositiveExamples.length).to.equal(0, `false positives for "${label}":\n      ${examples}\n`);
+            const { falsePositiveExamples } = benchmarkFor(label);
+            const examples = falsePositiveExamples.slice(0, 10).map(formatExample).join('\n      ');
+            expect(falsePositiveExamples.length).to.equal(0, `false positives for "${label}":\n      ${examples}\n`);
         });
 
         it(`classifies >${MIN_WEIGHTED_ACCURACY * 100}% of weighted "${label}" buttons correctly`, () => {
-            const { weightedCorrect, weightedSupport } = benchmarks[i];
+            const { weightedCorrect, weightedSupport } = benchmarkFor(label);
             expect(weightedSupport).to.be.greaterThan(0, `expected labelled rows for "${label}"`);
             expect(weightedCorrect / weightedSupport).to.be.greaterThan(
                 MIN_WEIGHTED_ACCURACY,

package/tests-wtr/heuristics/get-potential-popups.test.ts

@@ -0,0 +1,28 @@
+import { expect } from '@esm-bundle/chai';
+import { getPotentialPopups } from '../../lib/heuristics';
+
+describe('getPotentialPopups', () => {
+    let container: HTMLDivElement;
+
+    beforeEach(() => {
+        container = document.createElement('div');
+        document.body.appendChild(container);
+    });
+
+    afterEach(() => {
+        container.remove();
+    });
+
+    it('returns positioned popups with their buttons', () => {
+        container.innerHTML = `
+            <div id="popup" style="position: fixed; bottom: 0;">
+                <p>We use cookies.</p>
+                <button>Reject all</button>
+                <button>Accept all</button>
+            </div>
+        `;
+        const popup = getPotentialPopups(1000).find((p) => p.element.id === 'popup');
+        expect(popup).to.exist;
+        expect(popup!.buttons.map((b) => b.text).sort()).to.deep.equal(['Accept all', 'Reject all']);
+    });
+});

package/tests-wtr/heuristics/heuristics-utils.test.ts

@@ -4,13 +4,9 @@ import {
     cleanButtonText,
     classifyButtonTextRegex,
     classifyButtons,
-    getActionablePopups,
-    isDisabled,
-    excludeContainers,
-    getButtonData,
-    isDialogLikeElement,
     isExcludedPopup,
-} from '../../lib/heuristics';
+} from '../../lib/heuristic-classify';
+import { getActionablePopups, isDisabled, excludeContainers, getButtonData, isDialogLikeElement } from '../../lib/heuristics';
 import { ButtonData } from '../../lib/types';
 
 function rejectButtons(buttons: ButtonData[]) {

package/tsconfig.build.json

@@ -7,6 +7,6 @@
         "rootDir": "./lib",
         "noCheck": true
     },
-    "include": ["lib/web.ts"],
+    "include": ["lib/web.ts", "lib/heuristic-classify.ts"],
     "exclude": []
 }

package/tsconfig.heuristics.json

@@ -0,0 +1,10 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "lib": ["es2021"],
+        "types": [],
+        "noEmit": true
+    },
+    "include": ["lib/heuristic-classify.ts"],
+    "exclude": []
+}

package/Dockerfile

@@ -1,9 +0,0 @@
-FROM node:12
-
-RUN apt update && apt install -y brotli jq
-RUN mkdir -p /app/ && chown -R node:node /app
-USER node
-COPY package.json /app/
-COPY package-lock.json /app/
-WORKDIR /app/
-RUN npm ci