fix: make the server tests hermetic

They read from public/, which does not exist on a clean checkout — CI runs
bun test before any build, so the four of them failed there while passing
locally against stale build output.

serve.ts now takes PUBLIC_DIR, and the tests serve a temporary tree they
create themselves. They exercise serve.ts rather than the build, which is
what they were always meant to do.

Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
This commit is contained in:
Lucas Winther
2026-08-15 01:26:01 +02:00
co-authored by Claude Opus 5
parent b86794a62d
commit f2cf9ba0cb
2 changed files with 34 additions and 15 deletions
+2 -1
View File
@@ -10,7 +10,8 @@
import { resolve } from "node:path"; import { resolve } from "node:path";
const PORT = Number(process.env.PORT ?? 3000); const PORT = Number(process.env.PORT ?? 3000);
const ROOT = "public"; /** Overridable so tests can point at a fixture tree instead of the build. */
const ROOT = process.env.PUBLIC_DIR ?? "public";
const ROOT_DIR = resolve(ROOT); const ROOT_DIR = resolve(ROOT);
/** Long-lived for fingerprint-free assets is wrong; keep it short and revalidate. */ /** Long-lived for fingerprint-free assets is wrong; keep it short and revalidate. */
+32 -14
View File
@@ -1,22 +1,42 @@
import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { afterAll, beforeAll, describe, expect, test } from "bun:test";
import { mkdtemp, mkdir, writeFile, rm } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
/** /**
* The static server is small, but it reads from the filesystem based on a * The static server reads from the filesystem based on a user-supplied path, so
* user-supplied path, so its confinement is worth pinning down. * its confinement is worth pinning down.
*
* Served from a temporary tree rather than public/: these tests exercise
* serve.ts, not the build, and coupling them to build output means `bun test`
* fails on a clean checkout — which is exactly how CI found this.
*/ */
let proc: Bun.Subprocess; let proc: Bun.Subprocess;
let base: string; let base: string;
let root: string;
beforeAll(async () => { beforeAll(async () => {
const port = 3200 + Math.floor(Math.random() * 300); root = await mkdtemp(join(tmpdir(), "event-clock-serve-"));
await mkdir(join(root, "data"), { recursive: true });
await writeFile(
join(root, "index.html"),
"<!doctype html><html><body>shell</body></html>",
);
await writeFile(join(root, "sw.js"), "// worker");
await writeFile(
join(root, "data", "events.v1.json"),
JSON.stringify({ schemaVersion: 1, generatedAt: "", events: [], sources: [] }),
);
const port = 3200 + Math.floor(Math.random() * 500);
base = `http://127.0.0.1:${port}`; base = `http://127.0.0.1:${port}`;
proc = Bun.spawn(["bun", "run", "serve.ts"], { proc = Bun.spawn(["bun", "run", "serve.ts"], {
env: { ...process.env, PORT: String(port) }, env: { ...process.env, PORT: String(port), PUBLIC_DIR: root },
stdout: "ignore", stdout: "ignore",
stderr: "ignore", stderr: "ignore",
}); });
for (let i = 0; i < 50; i += 1) { for (let i = 0; i < 60; i += 1) {
try { try {
await fetch(`${base}/api/health`); await fetch(`${base}/api/health`);
return; return;
@@ -27,8 +47,9 @@ beforeAll(async () => {
throw new Error("server did not start"); throw new Error("server did not start");
}); });
afterAll(() => { afterAll(async () => {
proc.kill(); proc.kill();
await rm(root, { recursive: true, force: true });
}); });
describe("static server", () => { describe("static server", () => {
@@ -36,19 +57,19 @@ describe("static server", () => {
expect((await fetch(`${base}/`)).status).toBe(200); expect((await fetch(`${base}/`)).status).toBe(200);
const feed = await fetch(`${base}/data/events.v1.json`); const feed = await fetch(`${base}/data/events.v1.json`);
expect(feed.status).toBe(200); expect(feed.status).toBe(200);
expect((await feed.json()).schemaVersion).toBe(1); expect(((await feed.json()) as { schemaVersion: number }).schemaVersion).toBe(1);
}); });
test("reports health", async () => { test("reports health", async () => {
const res = await fetch(`${base}/api/health`); const res = await fetch(`${base}/api/health`);
expect(res.status).toBe(200); expect(res.status).toBe(200);
expect((await res.json()).status).toBe("ok"); expect(((await res.json()) as { status: string }).status).toBe("ok");
}); });
test("falls back to the shell for unknown routes", async () => { test("falls back to the shell for unknown routes", async () => {
const res = await fetch(`${base}/deep/link`); const res = await fetch(`${base}/deep/link`);
expect(res.status).toBe(200); expect(res.status).toBe(200);
expect(await res.text()).toContain("<!doctype html>"); expect(await res.text()).toContain("shell");
}); });
test("404s missing data rather than serving the shell", async () => { test("404s missing data rather than serving the shell", async () => {
@@ -57,17 +78,14 @@ describe("static server", () => {
expect((await fetch(`${base}/data/nope.json`)).status).toBe(404); expect((await fetch(`${base}/data/nope.json`)).status).toBe(404);
}); });
test("never serves a file outside public/", async () => { test("never serves a file outside the root", async () => {
for (const path of [ for (const path of [
"/..%2fpackage.json", "/..%2fpackage.json",
"/..%2f..%2fetc/passwd", "/..%2f..%2fetc/passwd",
"/%2e%2e/package.json", "/%2e%2e/package.json",
"/%2e%2e%2f%2e%2e%2fpackage.json", "/%2e%2e%2f%2e%2e%2fpackage.json",
]) { ]) {
const res = await fetch(`${base}${path}`); const body = await (await fetch(`${base}${path}`)).text();
const body = await res.text();
// Either refused, or normalised to something inside public/ — but never
// the repository file itself.
expect(body).not.toContain('"name": "gacha-event-tracker"'); expect(body).not.toContain('"name": "gacha-event-tracker"');
expect(body).not.toContain("root:x:0:0"); expect(body).not.toContain("root:x:0:0");
} }