@uniflowed/test 0.5.0 → 0.6.0

package/internal/browser/page-transport.js

@@ -1,5 +1,6 @@
 // @flow
 import type { BrowserTransport, ControlOptions } from "./cdp.js";
+import { runnerFetch } from "./runner-fetch.js";
 
 export async function createTransport(options: ControlOptions): Promise<BrowserTransport> {
   if (options.executable != null)
@@ -12,7 +13,8 @@ export async function createTransport(options: ControlOptions): Promise<BrowserT
     method: string,
     args: $ReadOnlyArray<mixed> = [],
   ): Promise<$FlowFixMe> {
-    const response = await fetch("/uf-test/browser", {
+    // The platform's `fetch`, not the global a test's request mock replaced.
+    const response = await runnerFetch("/uf-test/browser", {
       method: "POST",
       headers: { "content-type": "application/json", "uf-test-browser": token },
       body: JSON.stringify({ id, method, args }),

package/internal/browser/page.js

@@ -37,6 +37,7 @@
 import * as output from "../output.js";
 import { run } from "../run.js";
 import { installInSourceTests } from "../../in-source.js";
+import { runnerFetch } from "./runner-fetch.js";
 
 /** One file, as the server hands it over. */
 type PageRequest = {
@@ -74,7 +75,9 @@ function flush(): Promise<void> {
   if (already != null) return already;
   if (queue.length === 0) return Promise.resolve();
   const batch = queue.splice(0, queue.length);
-  const sent = fetch("/uf-test/events", {
+  // Not the global: a file that installed a request mock owns that one, and
+  // would answer the runner's report as an unhandled request.
+  const sent = runnerFetch("/uf-test/events", {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify(batch),
@@ -195,7 +198,7 @@ function page(): $FlowFixMe {
 async function serve(): Promise<void> {
   let request: PageRequest;
   try {
-    request = await (await fetch("/uf-test/next")).json();
+    request = await (await runnerFetch("/uf-test/next")).json();
   } catch {
     // The driver has gone. Nothing to report it to.
     return;

package/internal/browser/runner-fetch.js

@@ -0,0 +1,38 @@
+// @flow
+//
+// Internal to `@uniflowed/test`: the `fetch` the browser runner talks to `uf`
+// with.
+//
+// A page reports its results over HTTP — `POST /uf-test/events`, and
+// `POST /uf-test/browser` for `createBrowser` — and the file under test runs
+// in that same page. A file that installs a request mock replaces
+// `globalThis.fetch`, and `@uniflowed/mock`'s default policy rejects every
+// request no handler claimed. Reached through the global, the runner's own
+// requests would be answered by the test's mock: rejected, and the rejection
+// swallowed by the reporter, so the results would never reach `uf test`
+// (ubugeeei-prod/uf#1394).
+//
+// So the harness captures the platform's `fetch` in a classic script that runs
+// before any module — before the runner, and so before any test file could
+// replace it — and the runner's requests go through that capture. A constant
+// captured in this module would depend on when it was first evaluated and on
+// `page.js` and the import map reaching it by the same URL; the harness
+// script depends on neither.
+
+/** Where `server.js`'s harness leaves the platform's `fetch`. */
+export const RUNNER_FETCH: symbol = Symbol.for("uf.test.browser.fetch");
+
+/**
+ * `fetch`, as it was before any test file ran.
+ *
+ * Falls back to the global when nothing was captured, which is a page not
+ * served by `uf test --browser` — there is no test file ahead of it to have
+ * replaced anything.
+ */
+export function runnerFetch(input: RequestInfo, init?: RequestOptions): Promise<Response> {
+  const captured = Reflect.get(globalThis, RUNNER_FETCH);
+  if (typeof captured === "function") {
+    return captured(input, init);
+  }
+  return fetch(input, init);
+}

package/internal/browser/server.js

@@ -639,6 +639,10 @@ function harnessHtml(map: string, browserToken: string): string {
     '<meta charset="utf-8">',
     "<title>uf test</title>",
     `<script>globalThis[Symbol.for("uf.test.browser.token")]=${JSON.stringify(browserToken)}</script>`,
+    // Before any module, so before any test file can replace it: the runner
+    // reports through this `fetch`, never through a mocked global. See
+    // `./runner-fetch.js`.
+    '<script>globalThis[Symbol.for("uf.test.browser.fetch")]=globalThis.fetch.bind(globalThis)</script>',
     `<script type="importmap">${map}</script>`,
     `<script type="module" src="${page}"></script>`,
     "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniflowed/test",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "The test API and worker for `uf test`: describe/it, a full matcher set, and the process uf fans test files out to.",
   "type": "module",
   "license": "MIT",
@@ -38,7 +38,7 @@
     "!*.test.js"
   ],
   "dependencies": {
-    "@uniflowed/host": "0.5.0",
+    "@uniflowed/host": "0.6.0",
     "pixelmatch": "^7.1.0",
     "pngjs": "^7.0.0"
   },