Release build 8.7.0 [ci release]

jonathanKingston · github-actions[bot] · commit 4588fd2748c4 · 2025-03-28T10:51:28.000Z
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -64,14 +64,12 @@ jobs:
                   key: docs-output-${{ github.run_id }}
             - name: Install Playwright Browsers
               run: npx playwright install --with-deps
-            - name: Install dependencies for CI integration tests
-              run: sudo apt-get install xvfb
             - run: npm run test-int-x
             - uses: actions/upload-artifact@v4
               if: always()
               with:
                   name: playwright-report-pages
-                  path: special-pages/test-results
+                  path: special-pages/playwright-report
                   retention-days: 5
             - name: Build docs
               run: npm run docs
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,2 @@
-- Add support for non isolated messaging (#1586)
-- Adds last updated date to PR build-and-release comment (#1563)
-- add snapshot checking in CI (#1587)
-- build(deps-dev): bump typescript-eslint from 8.26.0 to 8.27.0 (#1582)
+- Revert "Add support for non isolated messaging (#1586)" (#1591)
+- enable snapshot tests in CI (#1588)
diff --git a/Sources/ContentScopeScripts/dist/contentScope.js b/Sources/ContentScopeScripts/dist/contentScope.js
@@ -5976,17 +5976,24 @@
     const userUnprotectedDomains = $USER_UNPROTECTED_DOMAINS$;
     const userPreferences = $USER_PREFERENCES$;
     const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences, platformSpecificFeatures);
-    const handlerNames = [];
     if (false) {
-      handlerNames.push("contentScopeScriptsIsolated");
+      processedConfig.messagingConfig = new WebkitMessagingConfig({
+        webkitMessageHandlerNames: ["contentScopeScriptsIsolated"],
+        secret: "",
+        hasModernWebkitAPI: true
+      });
     } else {
-      handlerNames.push("contentScopeScripts");
+      processedConfig.messagingConfig = new TestTransportConfig({
+        notify() {
+        },
+        request: async () => {
+        },
+        subscribe() {
+          return () => {
+          };
+        }
+      });
     }
-    processedConfig.messagingConfig = new WebkitMessagingConfig({
-      webkitMessageHandlerNames: handlerNames,
-      secret: "",
-      hasModernWebkitAPI: true
-    });
     load({
       platform: processedConfig.platform,
       site: processedConfig.site,
diff --git a/Sources/ContentScopeScripts/dist/contentScopeIsolated.js b/Sources/ContentScopeScripts/dist/contentScopeIsolated.js
@@ -12098,17 +12098,24 @@
     const userUnprotectedDomains = $USER_UNPROTECTED_DOMAINS$;
     const userPreferences = $USER_PREFERENCES$;
     const processedConfig = processConfig(config2, userUnprotectedDomains, userPreferences, platformSpecificFeatures);
-    const handlerNames = [];
     if (true) {
-      handlerNames.push("contentScopeScriptsIsolated");
+      processedConfig.messagingConfig = new WebkitMessagingConfig({
+        webkitMessageHandlerNames: ["contentScopeScriptsIsolated"],
+        secret: "",
+        hasModernWebkitAPI: true
+      });
     } else {
-      handlerNames.push("contentScopeScripts");
+      processedConfig.messagingConfig = new TestTransportConfig({
+        notify() {
+        },
+        request: async () => {
+        },
+        subscribe() {
+          return () => {
+          };
+        }
+      });
     }
-    processedConfig.messagingConfig = new WebkitMessagingConfig({
-      webkitMessageHandlerNames: handlerNames,
-      secret: "",
-      hasModernWebkitAPI: true
-    });
     load({
       platform: processedConfig.platform,
       site: processedConfig.site,
diff --git a/injected/entry-points/apple.js b/injected/entry-points/apple.js
@@ -3,7 +3,7 @@
  */
 import { load, init } from '../src/content-scope-features.js';
 import { processConfig, platformSpecificFeatures } from './../src/utils';
-import { WebkitMessagingConfig } from '../../messaging/index.js';
+import { WebkitMessagingConfig, TestTransportConfig } from '../../messaging/index.js';
 
 function initCode() {
     // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f
@@ -15,17 +15,27 @@ function initCode() {
 
     const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences, platformSpecificFeatures);
 
-    const handlerNames = [];
     if (import.meta.injectName === 'apple-isolated') {
-        handlerNames.push('contentScopeScriptsIsolated');
+        processedConfig.messagingConfig = new WebkitMessagingConfig({
+            webkitMessageHandlerNames: ['contentScopeScriptsIsolated'],
+            secret: '',
+            hasModernWebkitAPI: true,
+        });
     } else {
-        handlerNames.push('contentScopeScripts');
+        processedConfig.messagingConfig = new TestTransportConfig({
+            notify() {
+                // noop
+            },
+            request: async () => {
+                // noop
+            },
+            subscribe() {
+                return () => {
+                    // noop
+                };
+            },
+        });
     }
-    processedConfig.messagingConfig = new WebkitMessagingConfig({
-        webkitMessageHandlerNames: handlerNames,
-        secret: '',
-        hasModernWebkitAPI: true,
-    });
 
     load({
         platform: processedConfig.platform,
diff --git a/special-pages/package.json b/special-pages/package.json
@@ -14,7 +14,7 @@
     "test-int": "playwright test --grep-invert '@screenshots'",
     "test-int-x": "npm run test-int",
     "test-int-snapshots": "playwright test --grep '@screenshots'",
-    "test-int-snapshots-update": "playwright test --grep '@screenshots' --update-snapshots --last-failed",
+    "test-int-snapshots-update": "playwright test --grep '@screenshots' --update-snapshots --last-failed --pass-with-no-tests",
     "test.screenshots": "playwright test --grep '@screenshots'",
     "test.windows": "npm run test-int -- --project windows",
     "test.macos": "npm run test-int -- --project macos",
diff --git a/special-pages/pages/duckplayer/integration-tests/duckplayer-screenshots.spec.js b/special-pages/pages/duckplayer/integration-tests/duckplayer-screenshots.spec.js
@@ -1,9 +1,7 @@
-/* global process */
 import { expect, test } from '@playwright/test';
 import { DuckPlayerPage } from './duck-player.js';
 
 test.describe('screenshots @screenshots', () => {
-    test.skip(process.env.CI === 'true');
     test('regular layout', async ({ page }, workerInfo) => {
         const duckplayer = DuckPlayerPage.create(page, workerInfo);
         // load as normal
diff --git a/special-pages/pages/new-tab/app/favorites/integration-tests/favorites.page.js b/special-pages/pages/new-tab/app/favorites/integration-tests/favorites.page.js
@@ -201,8 +201,7 @@ export class FavoritesPage {
         await body.press('Tab');
         await body.press('Tab');
         const statsToggle = page.getByLabel('Hide recent activity');
-        const isActive = await statsToggle.evaluate((handle) => handle === document.activeElement);
-        expect(isActive).toBe(true);
+        await expect(statsToggle).toBeFocused();
     }
 
     /**
diff --git a/special-pages/pages/new-tab/app/privacy-stats/integration-tests/privacy-stats.page.js b/special-pages/pages/new-tab/app/privacy-stats/integration-tests/privacy-stats.page.js
@@ -41,7 +41,7 @@ export class PrivacyStatsPage {
      */
     async hasRows(count) {
         const rows = this.rows();
-        expect(await rows.count()).toBe(count);
+        await expect(rows).toHaveCount(count);
     }
 
     /**
@@ -76,7 +76,7 @@ export class PrivacyStatsPage {
         await this.ntp.openPage({ additional: { stats: 'manyOnlyTop' } });
 
         // control, ensure we have 5 rows
-        expect(await rows.count()).toBe(5);
+        await expect(rows).toHaveCount(5);
 
         // check the initial values
         expect(await rows.nth(0).textContent()).toBe('Facebook310');
@@ -103,8 +103,8 @@ export class PrivacyStatsPage {
         // open the NTP with the correct param
         await this.ntp.openPage({ additional: { stats: 'fewOnlyTop' } });
 
-        // control, ensure we have 5 rows
-        expect(await rows.count()).toBe(3);
+        // control, ensure we have 3 rows
+        await expect(rows).toHaveCount(3);
 
         // check the initial values
         expect(await rows.nth(0).textContent()).toBe('Facebook310');
@@ -126,7 +126,7 @@ export class PrivacyStatsPage {
         await this.ntp.openPage({ additional: { stats: 'topAndOneOther' } });
 
         // should show all 5 items
-        expect(await rows.count()).toBe(5);
+        await expect(rows).toHaveCount(5);
 
         // And should also show the text, but no expander
         // ensure the toggle is absent
@@ -145,7 +145,7 @@ export class PrivacyStatsPage {
         await this.ntp.openPage({ additional: { stats: 'manyTopAndOther' } });
 
         // control, ensure we have 5 rows
-        expect(await rows.count()).toBe(5);
+        await expect(rows).toHaveCount(5);
 
         // control: ensure 'other' text is absent here
         await expect(this.page.getByTestId('ListFooter')).not.toContainText('2 attempts from other networks');
diff --git a/special-pages/pages/new-tab/app/privacy-stats/integration-tests/privacy-stats.spec.js b/special-pages/pages/new-tab/app/privacy-stats/integration-tests/privacy-stats.spec.js
@@ -95,6 +95,7 @@ test.describe('newtab privacy stats', () => {
             const psp = new PrivacyStatsPage(page, ntp);
             await ntp.reducedMotion();
             await ntp.openPage({ additional: { stats: 'none' } });
+            await page.getByText('Tracking protections active').waitFor();
 
             await psp.receiveData({
                 totalCount: 2,
diff --git a/special-pages/pages/special-error/integration-tests/special-error-screenshots.spec.js b/special-pages/pages/special-error/integration-tests/special-error-screenshots.spec.js
@@ -1,12 +1,9 @@
-/* global process */
 import { expect, test } from '@playwright/test';
 import { SpecialErrorPage } from './special-error';
 
 const maxDiffPixels = 20;
 
 test.describe('screenshots @screenshots', () => {
-    test.skip(process.env.CI === 'true');
-
     test('SSL expired cert error', async ({ page }, workerInfo) => {
         const special = SpecialErrorPage.create(page, workerInfo);
         await special.openPage({ errorId: 'ssl.expired' });
diff --git a/special-pages/playwright.config.js b/special-pages/playwright.config.js
@@ -96,7 +96,8 @@ export default defineConfig({
     retries: process.env.CI ? 2 : 0,
     /* Opt out of parallel tests on CI. */
     workers: process.env.CI ? 1 : undefined,
-    reporter: process.env.CI ? 'github' : [['html', { open: 'never' }]],
+    /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+    reporter: 'html',
     // @ts-expect-error - Type 'undefined' is not assignable to type 'string'. process.env
     webServer: {
         command: process.env.PAGE ? `npm run watch -- --page ${process.env.PAGE}` : 'npm run serve',
@@ -107,5 +108,6 @@ export default defineConfig({
     use: {
         actionTimeout: 5000,
         trace: 'on-first-retry',
+        video: { mode: 'on-first-retry' },
     },
 });

Original file line number	Diff line number	Diff line change
`@@ -201,8 +201,7 @@ export class FavoritesPage {`
`201`	`201`	`await body.press('Tab');`
`202`	`202`	`await body.press('Tab');`
`203`	`203`	`const statsToggle = page.getByLabel('Hide recent activity');`
`204`		`- const isActive = await statsToggle.evaluate((handle) => handle === document.activeElement);`
`205`		`- expect(isActive).toBe(true);`
	`204`	`+ await expect(statsToggle).toBeFocused();`
`206`	`205`	`}`
`207`	`206`
`208`	`207`	`/**`