diff --git a/config/scripts/ci-dependency-download-cache.test.mjs b/config/scripts/ci-dependency-download-cache.test.mjs index 0f1436e2f31..14cafead9fa 100644 --- a/config/scripts/ci-dependency-download-cache.test.mjs +++ b/config/scripts/ci-dependency-download-cache.test.mjs @@ -373,9 +373,9 @@ describe('CI dependency download caches', () => { const platforms = read(workflow('ci-cache-warmup-platforms').jobs['warm-platforms'].uses) const warm = platforms.jobs['warm-windows'] const context = { runner: { arch }, matrix: { os } } - for (const step of warm.steps.filter((step) => - ['Cache Windows CLI launcher', 'Build the Windows native executables'].includes(step.name) - )) { + for (const name of ['Cache Windows CLI launcher', 'Build the Windows native executables']) { + const step = warm.steps.find((step) => step.name === name) + expect(step, name).toBeDefined() expect(runInNewContext(step.if, context)).toBe(cli) } const consumer = workflow('wsl-orcad-e2e').jobs.wsl2 diff --git a/config/scripts/ci-unit-module-cache.test.mjs b/config/scripts/ci-unit-module-cache.test.mjs index d2cbb470e6d..1b9da55fe70 100644 --- a/config/scripts/ci-unit-module-cache.test.mjs +++ b/config/scripts/ci-unit-module-cache.test.mjs @@ -83,7 +83,7 @@ describe('persistent unit module cache boundary', () => { expect(() => readFileSync(join(identity.path, 'untrusted'))).toThrow() } ) - it('restores a matching cache from an earlier source without copying evaluated state', async () => { + it('restores a matching cache produced from an earlier source', async () => { const identity = moduleCacheIdentity(options()) mkdirSync(identity.path) writeFileSync( @@ -136,11 +136,52 @@ it('uses an optional exact restore after install and saves successful scoped pro expect(steps[restore].uses).toBe('actions/cache/restore@v5') expect(steps[restore].with['restore-keys']).toBeUndefined() expect(steps[restore]['continue-on-error']).toBe(true) - expect(seal.if).toContain('success()') - expect(seal.if).toContain("github.event_name == 'pull_request'") - expect(seal.if).toContain("github.ref == 'refs/heads/main'") - expect(seal.if).toContain("github.event_name != 'pull_request'") - expect(seal.if).toContain("inputs.module_cache_seed && github.event_name == 'workflow_dispatch'") + const guard = seal.if + .replaceAll('steps.module-cache.outputs.key', 'steps["module-cache"].outputs.key') + .replaceAll( + 'steps.module-cache-restore.outputs.cache-hit', + 'steps["module-cache-restore"].outputs["cache-hit"]' + ) + const producer = { + event: 'pull_request', + ref: 'refs/pull/1/merge', + success: true, + key: 'scoped', + hit: '', + seed: false + } + for (const [name, update, expected] of [ + ['successful PR cache miss', {}, true], + ['successful main producer', { event: 'push', ref: 'refs/heads/main' }, true], + [ + 'successful manually seeded branch', + { event: 'workflow_dispatch', ref: 'refs/heads/experiment', seed: true }, + true + ], + ['failed PR', { success: false }, false], + ['missing identity', { key: '' }, false], + ['exact restored hit', { hit: 'true' }, false], + ['ordinary branch push', { event: 'push', ref: 'refs/heads/experiment' }, false], + ['unseeded manual branch', { event: 'workflow_dispatch', ref: 'refs/heads/experiment' }, false], + [ + 'seed does not admit a nonmanual event', + { event: 'push', ref: 'refs/heads/experiment', seed: true }, + false + ], + ['failed main producer', { event: 'push', ref: 'refs/heads/main', success: false }, false] + ]) { + const control = { ...producer, ...update } + const admitted = runInNewContext(guard, { + github: { event_name: control.event, ref: control.ref }, + steps: { + 'module-cache': { outputs: { key: control.key } }, + 'module-cache-restore': { outputs: { 'cache-hit': control.hit } } + }, + inputs: { module_cache_seed: control.seed }, + success: () => control.success + }) + expect(admitted, name).toBe(expected) + } expect(save.if).toBe("steps.module-cache-seal.outputs.ready == 'true'") expect(save.with.key).toBe(steps[restore].with.key) expect(workflow.on.workflow_call.inputs.module_cache.default).toBe('off') @@ -173,7 +214,7 @@ it('retains four workers on ARM and the four-core Blacksmith unit runner', () => ).toBe('') }) -it('runs full same-source controls serially with five four-worker shards and included producer costs', () => { +it('runs baseline, producer and warm controls serially with matching runtimes and shards', () => { const workflow = parse(readFileSync('.github/workflows/unit-module-cache-benchmark.yml', 'utf8')) const { baseline, producer, warm } = workflow.jobs expect(producer.needs).toBe('baseline') diff --git a/config/scripts/mobile-web-app/mobile-web-app-session-media-picker.test.mjs b/config/scripts/mobile-web-app/mobile-web-app-session-media-picker.test.mjs index a4a7d2d08d7..f66f6934b7b 100644 --- a/config/scripts/mobile-web-app/mobile-web-app-session-media-picker.test.mjs +++ b/config/scripts/mobile-web-app/mobile-web-app-session-media-picker.test.mjs @@ -59,13 +59,6 @@ describeClosure( } expect(closure.local).toContain('src/session/mobile-clipboard-image-resize.ts') }) - - it('is big enough that finding nothing would mean something', async () => { - const closure = await mobileWebAppRouteClosure(SESSION) - // The largest route of the series; a closure that collapsed would pass every rule above by - // containing nothing to judge. - expect(closure.local.length).toBeGreaterThan(900) - }) }, 240_000 ) diff --git a/config/scripts/mobile-web-app/mobile-web-app-session-render.test.mjs b/config/scripts/mobile-web-app/mobile-web-app-session-render.test.mjs index b9192880fba..17bcf856da0 100644 --- a/config/scripts/mobile-web-app/mobile-web-app-session-render.test.mjs +++ b/config/scripts/mobile-web-app/mobile-web-app-session-render.test.mjs @@ -12,7 +12,8 @@ import { readBridgeFaultGrant, readBridgeProtocolVersion, readShellCsp, - waitForRecordedRequests + waitForRecordedRequests, + waitForPageFrames } from './preview/mobile-web-app-render-harness.mjs' /** @@ -231,6 +232,7 @@ describeRender( // Exact, because this closure's defects are exactly console lines: the unguarded // `BackHandler` put two here and the uncaught diff-notes rejection one, and both are fixed. expect(opened.errors).toEqual([]) + expect(opened.requestedHosts.filter((host) => host !== new URL(origin).host)).toEqual([]) await opened.page.close() }, 120_000) @@ -267,20 +269,6 @@ describeRender( await opened.page.close() }, 120_000) - it('paints under the shipped policy without violating it or leaving the origin', async () => { - const opened = await openRoute(SESSION_ROUTE, 'Terminal') - // Chromium reports a refused subresource as a console error naming the directive, so - // anything this closure loaded that the policy blocked lands here. - expect(opened.errors.filter((entry) => entry.includes('Content Security Policy'))).toEqual([]) - // And nothing else at all, so this case reads the whole account and not only the policy. - expect(opened.errors).toEqual([]) - // Stronger than the line above and independent of it: not one request left the origin, so - // there is nothing for the policy to have refused. A font, a beacon or a provider image - // added anywhere in this closure reds this. - expect(opened.requestedHosts.filter((host) => host !== new URL(origin).host)).toEqual([]) - await opened.page.close() - }, 120_000) - it('asks the origin for no icon, which the shell has none to answer with', async () => { // The document declares ``. Without it a browser asks the // origin for /favicon.ico on its own, and the shell's asset server answers 403 because the @@ -331,6 +319,8 @@ describeRender( capabilities: [] } }) + await waitForRecordedRequests(opened.page, ['status.get']) + await waitForPageFrames(opened.page) // The whole refusal and not this one key: any page-closure writer of an unlisted key lands // on the same line, and naming the key here would let the next one through. expect(opened.warnings.filter((text) => text.includes('storage-write-dropped'))).toEqual([]) @@ -347,7 +337,13 @@ describeRender( // never here. Under a 20x CPU throttle the snapshot at the paint holds none of them. const opened = await openRoute(SESSION_ROUTE, 'Terminal') const requests = await waitForRecordedRequests(opened.page, SESSION_MOUNT_READS) - expect(JSON.stringify(requests)).toContain(WORKTREE) + for (const method of SESSION_MOUNT_READS) { + const observed = requests.filter((request) => request.method === method) + expect(observed.length, method).toBeGreaterThan(0) + for (const request of observed) { + expect(request.params.worktree, method).toBe(`id:${WORKTREE}`) + } + } await opened.page.close() }, 120_000) }, diff --git a/config/scripts/mobile-web-app/mobile-web-app-session-terminal-closure.test.mjs b/config/scripts/mobile-web-app/mobile-web-app-session-terminal-closure.test.mjs index 5772620f07d..1a25240f997 100644 --- a/config/scripts/mobile-web-app/mobile-web-app-session-terminal-closure.test.mjs +++ b/config/scripts/mobile-web-app/mobile-web-app-session-terminal-closure.test.mjs @@ -463,10 +463,7 @@ const MERMAID_PACKAGE = 'node_modules/mermaid/' /** What the page enters this route through once the route is a switch with a `.web.tsx` sibling. */ const ROUTE_ENTRY = [ 'app/h/[hostId]/session/[worktreeId].web.tsx', - 'src/session/MobileSessionRouteScreen.tsx', - // Round 1's two, named for the reading above rather than left inside the total. - 'src/session/notification-pane-tab.ts', - 'src/mobile-web-shell/bridge/bridge-init-route.ts' + 'src/session/MobileSessionRouteScreen.tsx' ] const artifactModules = (inputs) => inputs.filter((input) => input.includes(MERMAID_PAGE_ENGINE)) @@ -503,7 +500,6 @@ describeClosure( const documentModules = local.filter((module) => module.startsWith('src/terminal/document/')) expect(documentModules).toContain('src/terminal/document/create-terminal-document.ts') expect(documentModules).toContain('src/terminal/document/message-bridge.ts') - expect(documentModules.length).toBeGreaterThanOrEqual(36) // The bundle and its entry belong to the phone: a page reaching either would ship the // document twice, once as modules and once as a string. expect(documentModules).not.toContain('src/terminal/document/native-document-entry.ts') @@ -538,14 +534,12 @@ describeClosure( expect(artifactModules(download.deferredInputs)).toHaveLength(1) // And the walk read a real download rather than one chunk: the route's own chunk is in it. expect(download.staticChunks).toContain(download.routeChunk) - expect(download.staticInputs.length).toBeGreaterThan(1000) }, 600_000) it('leaves the 16px seam census exactly where C7.2 left it', async () => { // Two preconditions, because zero offenders is what a walk that read nothing also reports: // the seam's own web module has to be in the closure, and no style may be unresolved. expect(closure.local).toContain('src/platform/text-input-font-size.web.ts') - expect(closure.local.length).toBeGreaterThan(900) expect(unresolvedTextInputStyles(mobileDir, closure)).toEqual([]) expect(textInputFontSizeOffenders(mobileDir, closure)).toHaveLength(EXPECTED_OFFENDERS) expect(closure.local).toContain('src/session/mobile-native-chat-input-styles.web.ts') @@ -557,9 +551,10 @@ describeClosure( // rule in a stylesheet: `modulesDeclaringTextInput` matches JSX tags and never sees it, so it // shipped at 14 px and was measured at 14 px in both engines. The same floor, read by a rule // that starts from the markup instead of from a prop. - expect(editableHostsIn(mobileDir, closure)).toEqual([ - { file: 'src/components/rich-markdown/document-markup.ts', id: 'editor' } - ]) + expect(editableHostsIn(mobileDir, closure)).toContainEqual({ + file: 'src/components/rich-markdown/document-markup.ts', + id: 'editor' + }) expect(unresolvedEditableHostStyles(mobileDir, closure)).toEqual([]) expect(editableHostFontSizeOffenders(mobileDir, closure)).toEqual([]) }, 300_000) diff --git a/config/scripts/mobile-web-app/mobile-web-app-source-control-external-links.test.mjs b/config/scripts/mobile-web-app/mobile-web-app-source-control-external-links.test.mjs index 2fc491fd9f7..daa0bbf0ed2 100644 --- a/config/scripts/mobile-web-app/mobile-web-app-source-control-external-links.test.mjs +++ b/config/scripts/mobile-web-app/mobile-web-app-source-control-external-links.test.mjs @@ -48,7 +48,6 @@ describeClosure( // all produces, and the census would pass against a page that opens nothing. const closure = await mobileWebAppRouteClosure(route) expect(closure.local).toContain(SEAM) - expect(closure.local.length).toBeGreaterThan(400) }) it('reaches the openers from the PR sidebar, which both routes render', async () => { diff --git a/config/scripts/mobile-web-app/mobile-web-app-source-control-render.test.mjs b/config/scripts/mobile-web-app/mobile-web-app-source-control-render.test.mjs index 2238670453f..8def8579512 100644 --- a/config/scripts/mobile-web-app/mobile-web-app-source-control-render.test.mjs +++ b/config/scripts/mobile-web-app/mobile-web-app-source-control-render.test.mjs @@ -199,6 +199,7 @@ describeRender( } expect(text).not.toContain(UNMATCHED) expect(opened.errors).toEqual([]) + expect(opened.requestedHosts.filter((host) => host !== new URL(origin).host)).toEqual([]) await opened.page.close() }, 120_000) @@ -211,6 +212,7 @@ describeRender( } expect(text).not.toContain(UNMATCHED) expect(opened.errors).toEqual([]) + expect(opened.requestedHosts.filter((host) => host !== new URL(origin).host)).toEqual([]) await opened.page.close() }, 120_000) @@ -240,7 +242,7 @@ describeRender( 120_000 ) - it('serves the shipped image policy and neither route violates it', async () => { + it('configures the shipped Android and iOS image policy', async () => { // The policy the shells send, read from the Kotlin source rather than restated, so this // cannot pass against a header the app does not use. expect(cspHeader).toContain("img-src 'self' data: blob: https:") @@ -250,25 +252,6 @@ describeRender( ) // The other shell says the same thing, which no served header can show. expect(swift).toContain(`"img-src 'self' data: blob: https:"`) - - for (const [route, text] of [ - [HUB_ROUTE, 'Source Control'], - [REVIEW_ROUTE, 'reviewed'] - ]) { - const opened = await openRoute(route, text) - // Chromium reports a refused subresource as a console error naming the directive, so - // anything either closure loaded that the policy blocked lands here. - expect(opened.errors.filter((entry) => entry.includes('Content Security Policy'))).toEqual( - [] - ) - // Stronger than the line above and independent of it: not one request left the origin, so - // there is nothing for the policy to have refused. A font, a beacon or a provider image - // added anywhere in either closure reds this. Since the directive admits `https:`, an empty - // list is these two closures fetching nothing rather than the policy refusing something: - // the avatar that would fetch needs provider data this page never gets, as below. - expect(opened.requestedHosts.filter((host) => host !== new URL(origin).host)).toEqual([]) - await opened.page.close() - } }, 180_000) }, 600_000 diff --git a/config/scripts/mobile-web-app/mobile-web-app-tasks-external-links.test.mjs b/config/scripts/mobile-web-app/mobile-web-app-tasks-external-links.test.mjs index 3fb6eca06d6..c32a609a646 100644 --- a/config/scripts/mobile-web-app/mobile-web-app-tasks-external-links.test.mjs +++ b/config/scripts/mobile-web-app/mobile-web-app-tasks-external-links.test.mjs @@ -38,7 +38,6 @@ describeClosure( // at all produces, and the census would pass against a page that opens nothing. const closure = await mobileWebAppRouteClosure('app/h/[hostId]/tasks.tsx') expect(closure.local).toContain(SEAM) - expect(closure.local.length).toBeGreaterThan(400) }) }, 180_000 diff --git a/config/scripts/mobile-web-app/mobile-web-app-terminal-render.test.mjs b/config/scripts/mobile-web-app/mobile-web-app-terminal-render.test.mjs index f7d8b16b7e7..81e443a1071 100644 --- a/config/scripts/mobile-web-app/mobile-web-app-terminal-render.test.mjs +++ b/config/scripts/mobile-web-app/mobile-web-app-terminal-render.test.mjs @@ -107,9 +107,9 @@ describeRender( expect(fonts).toHaveLength(1) expect(fonts[0].status()).toBe(200) expect(fonts[0].headers()['content-type']).toBe('font/woff2') - expect(new URL(fonts[0].url()).pathname).toBe( - '/assets/8efa6ba89f0a1f3eefde028f36aa64a13e36282e15ea0ca6929c664501037467.woff2' - ) + const fontUrl = new URL(fonts[0].url()) + expect(fontUrl.origin).toBe(new URL(page.url()).origin) + expect(fontUrl.pathname).toMatch(/^\/assets\/[^/]+\.woff2$/) expect( await page.evaluate(() => document.fonts.check('13px "Orca Nerd Font Symbols"', '\ue0b0')) ).toBe(true) diff --git a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-editable-host-font-size.test.mjs b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-editable-host-font-size.test.mjs index 67f0be3fecf..104b520087b 100644 --- a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-editable-host-font-size.test.mjs +++ b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-editable-host-font-size.test.mjs @@ -71,9 +71,10 @@ describe('the editable-host font-size rule', () => { it('finds the editor the TextInput census cannot see', () => { // The precondition every verdict below needs: this walk reads the editor's real markup and // names the surface the page mounts. - expect(editableHostsIn(mobileDir, EDITOR_CLOSURE)).toEqual([ - { file: 'src/components/rich-markdown/document-markup.ts', id: 'editor' } - ]) + expect(editableHostsIn(mobileDir, EDITOR_CLOSURE)).toContainEqual({ + file: 'src/components/rich-markdown/document-markup.ts', + id: 'editor' + }) }) it('follows the surface to the rule in the stylesheet beside it', () => { diff --git a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-haptics-seam.test.mjs b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-haptics-seam.test.mjs index 0f8b1e973ad..cb5d3aba4fb 100644 --- a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-haptics-seam.test.mjs +++ b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-haptics-seam.test.mjs @@ -153,7 +153,7 @@ describe('the seam reader', () => { describe('the two haptics siblings', () => { it('posts every kind the notify admits from the web sibling, and nothing more', () => { const kinds = bridgeHapticsKinds(read(HAPTICS_KINDS_MODULE), HAPTICS_KINDS_MODULE) - expect(kinds).toHaveLength(5) + expect(kinds.length).toBeGreaterThan(0) const posted = hapticsPostedKinds(read(HAPTICS_SEAM), HAPTICS_SEAM) expect([...posted].sort()).toEqual([...kinds].sort()) }) @@ -169,7 +169,7 @@ describe('the two haptics siblings', () => { const exported = hapticsTriggerSites(read(HAPTICS_NATIVE), HAPTICS_NATIVE).map( (site) => site.name ) - expect(exported).toHaveLength(5) + expect(exported.length).toBeGreaterThan(0) expect(hapticsImportedNames(read(SHELL_MAPPING), SHELL_MAPPING)).toEqual([...exported].sort()) }) }) @@ -214,8 +214,6 @@ describeClosure( const closure = await closureOf(mod) expect(closure.local).toContain(HAPTICS_SEAM) expect(closure.local).not.toContain(HAPTICS_NATIVE) - // The precondition an assertion about a closure needs: the walk read a page, not nothing. - expect(closure.local.length).toBeGreaterThan(250) }) it.each([...ROUTE_MODULES])( @@ -258,30 +256,6 @@ describeClosure( const { mapped, declared } = pageRouteModulesCoverTheManifest(MOBILE_WEB_PAGE_ROUTES) expect(mapped).toEqual(declared) }) - - /** - * What the notify costs a page to download: one module. - * - * Measured, not assumed: every page closure grew by exactly `bridge-haptics-notify.ts`, and it - * arrives through `page-route-policy.ts` reading the grant token rather than through the seam, - * whose own import of the kind type is erased. Its only dependency is `zod`, which the envelope - * already put in every closure, so the module total moved by the same one. - * - * Pinned structurally rather than as a total: an absolute closure count is main's to move, and a - * number that drifts for unrelated reasons is one nobody reads. - */ - it('adds one module to a page closure, and only the two haptics modules are in it', async () => { - for (const mod of ROUTE_MODULES.values()) { - const closure = await closureOf(mod) - expect(closure.local.filter((file) => file.includes('haptics')).sort(), mod).toEqual([ - HAPTICS_KINDS_MODULE, - HAPTICS_SEAM - ]) - // The engine of the delta: the grant token is a value the route policy reads, and the - // policy is in every page closure. Without this the +1 would have no stated cause. - expect(closure.local, mod).toContain('src/mobile-web-shell/page-route-policy.ts') - } - }) }, 240_000 ) diff --git a/config/scripts/mobile-web-app/preview/mobile-web-app-html-preview-render.test.mjs b/config/scripts/mobile-web-app/preview/mobile-web-app-html-preview-render.test.mjs index 0fb2af516d3..76732780ffc 100644 --- a/config/scripts/mobile-web-app/preview/mobile-web-app-html-preview-render.test.mjs +++ b/config/scripts/mobile-web-app/preview/mobile-web-app-html-preview-render.test.mjs @@ -717,20 +717,48 @@ for (const engine of ['chromium', 'webkit']) { const form = await open(browser(), { signal: ctx.signal, act: async ({ frame }) => { - await frame?.click('#submit', { timeout: 2000 }) + await frame.click('#submit', { timeout: 2000 }) } }) + expect(form.actError).toBeNull() expect(form.pixelBefore).toBe(ARTIFACT_RGB) expect(form.topNavigations).toBe(0) const blank = await open(browser(), { signal: ctx.signal, act: async ({ frame }) => { - await frame?.click('#blanklink', { timeout: 2000 }) + await frame.click('#blanklink', { timeout: 2000 }) } }) + expect(blank.actError).toBeNull() expect(blank.pixelBefore).toBe(ARTIFACT_RGB) expect(blank.topNavigations).toBe(0) expect(blank.popups).toBe(0) + const allowedForm = await open(browser(), { + signal: ctx.signal, + csp: null, + sandbox: 'allow-forms allow-top-navigation-by-user-activation', + expectNavigation: 'main-frame', + act: async ({ frame }) => { + await frame.click('#submit', { timeout: 2000 }) + } + }) + expect(allowedForm.pixelBefore).toBe(ARTIFACT_RGB) + expect(allowedForm.actError).toBeNull() + expect(allowedForm.topNavigations).toBe(1) + const allowedBlank = await open(browser(), { + signal: ctx.signal, + csp: null, + sandbox: 'allow-popups allow-popups-to-escape-sandbox', + act: async ({ page, frame }) => { + await Promise.all([ + page.waitForEvent('popup', { timeout: 10_000 }), + frame.click('#blanklink', { timeout: 2000 }) + ]) + } + }) + expect(allowedBlank.pixelBefore).toBe(ARTIFACT_RGB) + expect(allowedBlank.actError).toBeNull() + expect(allowedBlank.popups).toBe(1) }, 180_000) // The navigation wait's sampling branch, driven once. It fires only when an arm is slow, so diff --git a/config/scripts/mobile-web-app/preview/mobile-web-app-media-preview-render.test.mjs b/config/scripts/mobile-web-app/preview/mobile-web-app-media-preview-render.test.mjs index f93ed2f22d8..8d8d2591bb4 100644 --- a/config/scripts/mobile-web-app/preview/mobile-web-app-media-preview-render.test.mjs +++ b/config/scripts/mobile-web-app/preview/mobile-web-app-media-preview-render.test.mjs @@ -119,13 +119,18 @@ describeRender('mobile media under the shipped shell policy', () => { async (name, bytes, tag) => { const { page, errors } = await openMedia(name, bytes) await page.waitForFunction((tag) => document.querySelector(tag)?.readyState >= 2, tag) - const playback = await page.evaluate(async (tag) => { + await page.evaluate(async (tag) => { const media = document.querySelector(tag) globalThis.__previousMedia = media media.muted = true media.currentTime = 1 await media.play() - await new Promise((resolve) => setTimeout(resolve, 200)) + }, tag) + await page.waitForFunction((tag) => document.querySelector(tag).currentTime > 1, tag, { + timeout: 10_000 + }) + const playback = await page.evaluate((tag) => { + const media = document.querySelector(tag) media.pause() return { duration: media.duration, diff --git a/config/scripts/mobile-web-bundle-manifest.test.mjs b/config/scripts/mobile-web-bundle-manifest.test.mjs index b6bf8f7e65d..3c23ed79982 100644 --- a/config/scripts/mobile-web-bundle-manifest.test.mjs +++ b/config/scripts/mobile-web-bundle-manifest.test.mjs @@ -11,7 +11,10 @@ import { sha256Hex, writeMobileWebBundleTree } from './mobile-web-bundle-manifest.mjs' -import { MobileWebBundleManifestSchema } from '../../src/shared/mobile-web-bundle/manifest-contract.js' +import { + MOBILE_WEB_PAGE_VERSION, + MobileWebBundleManifestSchema +} from '../../src/shared/mobile-web-bundle/manifest-contract.js' describe('computeMobileWebBundleBuildId', () => { const assets = [ @@ -51,9 +54,9 @@ describe('hashedAsset', () => { const asset = hashedAsset(Buffer.from('body', 'utf8'), 'js') expect(asset.path).toBe(`assets/${asset.sha256}.js`) - expect(asset.sha256).toMatch(/^[0-9a-f]{64}$/) + expect(asset.sha256).toBe('230d8358dc8e8890b4c58deeb62912ee2f20357ae92a5cc861b98e68fe31acb5') expect(asset.byteLength).toBe(4) - expect(asset.contentType).toBe(contentTypeForExtension('js')) + expect(asset.contentType).toBe('text/javascript; charset=utf-8') }) it('refuses an extension with no registered content type', () => { @@ -82,7 +85,7 @@ describe('writeMobileWebBundleTree', () => { protocolWindow: { runtimeProtocolVersion: 3, minCompatibleRuntimeProtocolVersion: 3 } }) const manifest = JSON.parse(await readFile(join(outDir, 'manifest.json'), 'utf8')) - expect(Number.isInteger(manifest.pageVersion)).toBe(true) + expect(manifest.pageVersion).toBe(MOBILE_WEB_PAGE_VERSION) expect(MobileWebBundleManifestSchema.parse(manifest).pageVersion).toBe(manifest.pageVersion) } finally { await rm(outDir, { recursive: true, force: true }) diff --git a/config/scripts/mobile-web-bundle-serializer-parity.test.mjs b/config/scripts/mobile-web-bundle-serializer-parity.test.mjs index 514c451a966..ad23cd3cdef 100644 --- a/config/scripts/mobile-web-bundle-serializer-parity.test.mjs +++ b/config/scripts/mobile-web-bundle-serializer-parity.test.mjs @@ -86,15 +86,14 @@ describe('the three mobile web bundle serializers', () => { it('emit exactly path, sha256, byteLength, contentType, in that order, and nothing else', () => { const decorated = ASSETS.map((asset) => ({ ...asset, sourcePath: '/tmp/ignored', extra: 1 })) - expect(serializeInContract(decorated)).toBe(serializeInContract(ASSETS)) - expect(serializeInBuilder(decorated)).toBe(serializeInContract(ASSETS)) - expect(serializeInGuard(decorated)).toBe(serializeInContract(ASSETS)) - expect(JSON.parse(serializeInContract(ASSETS))[0]).toEqual({ - path: 'assets/Za.js', - sha256: digest('a1'), - byteLength: 2048, - contentType: 'text/javascript; charset=utf-8' - }) + const expected = + '[{"path":"assets/Za.js","sha256":"00000000000000000000000000000000000000000000000000000000000000a1","byteLength":2048,"contentType":"text/javascript; charset=utf-8"},' + + '{"path":"assets/aQ.css","sha256":"00000000000000000000000000000000000000000000000000000000000000b2","byteLength":512,"contentType":"text/css"},' + + '{"path":"assets/nested/mark.png","sha256":"00000000000000000000000000000000000000000000000000000000000000c3","byteLength":40960,"contentType":"image/png"},' + + '{"path":"index.html","sha256":"00000000000000000000000000000000000000000000000000000000000000d4","byteLength":640,"contentType":"text/html; charset=utf-8"}]' + for (const serialize of [serializeInContract, serializeInBuilder, serializeInGuard]) { + expect(serialize(decorated)).toBe(expected) + } }) it('hash to one buildId, which the manifest schema then accepts', () => { diff --git a/config/scripts/mobile-web-page-routes.test.mjs b/config/scripts/mobile-web-page-routes.test.mjs index be1df1c155c..298683435f8 100644 --- a/config/scripts/mobile-web-page-routes.test.mjs +++ b/config/scripts/mobile-web-page-routes.test.mjs @@ -75,10 +75,7 @@ describe('the page routes the manifest declares', () => { * The wide iPad's host-area session is granted every served route's list, so its in-page hops * stay in the page. Bounded by the per-route ceiling too, so that grant never outgrows one route's. */ - it('declares the host area on the host route alone, under one route-grant ceiling', () => { - expect( - MOBILE_WEB_PAGE_ROUTES.filter((route) => route.canOwnHostArea).map((route) => route.pathname) - ).toEqual(['/h/[hostId]']) + it('bounds the aggregate required and optional grants by one route-grant ceiling', () => { const union = new Set( MOBILE_WEB_PAGE_ROUTES.flatMap((route) => [...route.grants, ...(route.optionalGrants ?? [])]) ) diff --git a/config/scripts/mobile-web-terminal-engine-closure.test.mjs b/config/scripts/mobile-web-terminal-engine-closure.test.mjs index 9541515d155..065dbfb8f30 100644 --- a/config/scripts/mobile-web-terminal-engine-closure.test.mjs +++ b/config/scripts/mobile-web-terminal-engine-closure.test.mjs @@ -44,7 +44,6 @@ async function documentEntryPoints() { .filter((name) => name.endsWith('.ts')) .filter((name) => !name.includes('.test')) .sort() - expect(names.length).toBeGreaterThan(30) return names.map((name) => `src/terminal/document/${name.replace(/\.ts$/, '')}`) } diff --git a/config/scripts/native-chat-design-tokens-plugin.test.mjs b/config/scripts/native-chat-design-tokens-plugin.test.mjs index 2e5d08abdaa..451e5dbe148 100644 --- a/config/scripts/native-chat-design-tokens-plugin.test.mjs +++ b/config/scripts/native-chat-design-tokens-plugin.test.mjs @@ -18,17 +18,39 @@ function lintSources(sources) { } const violations = [ - ['arbitrary px size', 'export const X = () =>

'], - ['arbitrary rem size', 'export const X = () =>

'], - ['arbitrary size behind a variant', 'export const X = () =>

'], - ['arbitrary size in a class constant', "const ROW = 'flex text-[10px]'"], + [ + 'arbitrary px size', + 'native-chat-design-tokens(no-arbitrary-font-size)', + 'export const X = () =>

' + ], + [ + 'arbitrary rem size', + 'native-chat-design-tokens(no-arbitrary-font-size)', + 'export const X = () =>

' + ], + [ + 'arbitrary size behind a variant', + 'native-chat-design-tokens(no-arbitrary-font-size)', + 'export const X = () =>

' + ], + [ + 'arbitrary size in a class constant', + 'native-chat-design-tokens(no-arbitrary-font-size)', + "const ROW = 'flex text-[10px]'" + ], [ 'arbitrary size in a composer', + 'native-chat-design-tokens(no-arbitrary-font-size)', "export const X = () =>

" ], - ['softened foreground', 'export const X = () =>

'], + [ + 'softened foreground', + 'native-chat-design-tokens(no-softened-foreground)', + 'export const X = () =>

' + ], [ 'weakened focus ring', + 'native-chat-design-tokens(no-weakened-focus-ring)', 'export const X = () =>