refactor(chain): keep the fake GitHub's pull and write helpers beside it

Author: TheGreatAxios

tests/chain/always.test.ts

@@ -1,8 +1,8 @@
 // A held Do the inbox's "Always, in this repository" lets Triage do on its own.
 import { expect, test } from "bun:test";
 import { allowTriageAutomation, approveHeldDo } from "../../apps/web/src/lib/hub-api.ts";
-import type { Write } from "./github.ts";
-import { chainStack, ALWAYS, sha, pullOf, once } from "./chain.ts";
+import { chainStack, ALWAYS, once } from "./chain.ts";
+import { sha, pullOf, type Write } from "./github.ts";
 
 const chain = chainStack();
 const { github, pushed, until, settled, verdictsOf } = chain;

tests/chain/chain.ts

@@ -10,7 +10,7 @@ import { createDB } from "@intx/db";
 import { listWorkflowDeployments, listWorkflowRuns, readWorkflowRunEvents } from "@intx/hub-client";
 import { parseTriageState, triageStateName, type PrTriageRow } from "@corbits/triage-contracts";
 import { saveAutomationMode } from "../../apps/web/src/lib/hub-api.ts";
-import { fakeGithub, OWNER, type Pull, type Write } from "./github.ts";
+import { fakeGithub, OWNER, type Pull } from "./github.ts";
 import { stubModel, type Answer, type Question } from "./model.ts";
 import { buildPortal, createDatabase, deliver, dropDatabase, listenerStarted, POLL_MS, setUpWorkspace, signUp, startHub, type Database, type Hub, type Workspace } from "./stack.ts";
 
@@ -56,18 +56,6 @@ function decide(id: string, question: Question): Answer {
   return { type: "choice", choice: first!, probabilities: { [first!]: 0.96, ...Object.fromEntries(rest.map((option) => [option, 0.04 / rest.length])) }, confidence: 0.96 };
 }
 
-export function sha(seed: string): string {
-  return new Bun.CryptoHasher("sha1").update(seed).digest("hex");
-}
-
-export function pullOf(number: number, head: string): Pull {
-  return {
-    number, title: "fix: widget sizing", body: "Fixes the widget's size.", author: "octocat", head,
-    files: [{ filename: "src/widget.ts", status: "modified", additions: 1, deletions: 1, patch: "@@ -1 +1 @@\n-export const size = 1;\n+export const size = 2;" }],
-    commits: ["fix: widget sizing"], labels: [], comments: [],
-  };
-}
-
 export type Claim = { status: "live" | "ended"; runId?: string; history: { head: string; runId: string; doneAt: string }[] };
 
 /** This test file's stack, started before its tests and stopped after them; call it once, at the file's top level. `env` overrides the hub's. */
@@ -228,14 +216,6 @@ export function chainStack(env: Record<string, string> = {}) {
   };
 }
 
-export function comments(writes: readonly Write[]): string[] {
-  return writes.filter((write) => write.method === "POST" && write.path.endsWith("/comments")).map((write) => String((write.body as { body: string }).body));
-}
-
-export function labelled(writes: readonly Write[]): string[] {
-  return writes.filter((write) => write.method === "POST" && write.path.endsWith("/labels")).flatMap((write) => (write.body as { labels: string[] }).labels);
-}
-
 /** Runs `scenario` once, on the first test that asks for it. */
 export function once<T>(scenario: () => Promise<T>): () => Promise<T> {
   let started: Promise<T> | undefined;

tests/chain/deterministic.test.ts

@@ -1,7 +1,8 @@
 // A policy of only deterministic rules, settled on the pass the pull request opens.
 import { expect, test } from "bun:test";
 import { VERDICT_LABELS } from "@corbits/triage-contracts";
-import { chainStack, DETERMINISTIC, isLiveDeployment, sha, pullOf, comments, labelled, once } from "./chain.ts";
+import { chainStack, DETERMINISTIC, isLiveDeployment, once } from "./chain.ts";
+import { sha, pullOf, comments, labelled } from "./github.ts";
 
 const { github, model, pushed, managers, settled, verdictsOf } = chainStack();
 

tests/chain/disconnected.test.ts

@@ -2,7 +2,8 @@
 import { expect, test } from "bun:test";
 import { TRIAGE_LISTENERS, VERDICT_LABELS } from "@corbits/triage-contracts";
 import { TIMINGS } from "./stack.ts";
-import { chainStack, SETTLE_MS, DISCONNECTED, isLiveDeployment, sha, pullOf, comments, labelled, once } from "./chain.ts";
+import { chainStack, SETTLE_MS, DISCONNECTED, isLiveDeployment, once } from "./chain.ts";
+import { sha, pullOf, comments, labelled } from "./github.ts";
 
 const chain = chainStack();
 const { github, pushed, until, rows, settled } = chain;

tests/chain/github.ts

@@ -24,6 +24,26 @@ export type Pull = {
 };
 export type Write = { method: string; path: string; body: unknown };
 
+export function sha(seed: string): string {
+  return new Bun.CryptoHasher("sha1").update(seed).digest("hex");
+}
+
+export function pullOf(number: number, head: string): Pull {
+  return {
+    number, title: "fix: widget sizing", body: "Fixes the widget's size.", author: "octocat", head,
+    files: [{ filename: "src/widget.ts", status: "modified", additions: 1, deletions: 1, patch: "@@ -1 +1 @@\n-export const size = 1;\n+export const size = 2;" }],
+    commits: ["fix: widget sizing"], labels: [], comments: [],
+  };
+}
+
+export function comments(writes: readonly Write[]): string[] {
+  return writes.filter((write) => write.method === "POST" && write.path.endsWith("/comments")).map((write) => String((write.body as { body: string }).body));
+}
+
+export function labelled(writes: readonly Write[]): string[] {
+  return writes.filter((write) => write.method === "POST" && write.path.endsWith("/labels")).flatMap((write) => (write.body as { labels: string[] }).labels);
+}
+
 /** A null `policy` is a repository with no policy file. */
 type Repo = { name: string; policy: string | null; pulls: Map<number, Pull>; checks: Map<string, CheckRun[]> };
 

tests/chain/held.test.ts

@@ -2,7 +2,8 @@
 import { expect, test } from "bun:test";
 import { TRIAGE_ROLE, VERDICT_LABELS } from "@corbits/triage-contracts";
 import { approveHeldDo, saveAutomationMode, saveRepoSettings } from "../../apps/web/src/lib/hub-api.ts";
-import { chainStack, HELD, sha, pullOf, labelled, once } from "./chain.ts";
+import { chainStack, HELD, once } from "./chain.ts";
+import { sha, pullOf, labelled } from "./github.ts";
 
 const chain = chainStack();
 const { github, pushed, until, rows, settled, verdictsOf } = chain;

tests/chain/judged.test.ts

@@ -1,7 +1,8 @@
 // A policy whose rules need the judge.
 import { expect, test } from "bun:test";
 import { VERDICT_LABELS } from "@corbits/triage-contracts";
-import { chainStack, JUDGED, sha, pullOf, comments, labelled, once } from "./chain.ts";
+import { chainStack, JUDGED, once } from "./chain.ts";
+import { sha, pullOf, comments, labelled } from "./github.ts";
 
 const { github, model, pushed, settled, verdictsOf } = chainStack();
 

tests/chain/pushed.test.ts

@@ -1,6 +1,7 @@
 // Pushes while the manager is up and after it stopped.
 import { expect, test } from "bun:test";
-import { chainStack, PUSHED, sha, pullOf, once } from "./chain.ts";
+import { chainStack, PUSHED, once } from "./chain.ts";
+import { sha, pullOf } from "./github.ts";
 
 const { github, pushed, until, rows, claimOf, managers, settled } = chainStack();
 

tests/chain/reread.test.ts

@@ -2,7 +2,8 @@
 import { expect, test } from "bun:test";
 import { VERDICT_LABELS } from "@corbits/triage-contracts";
 import { TIMINGS } from "./stack.ts";
-import { chainStack, REREAD, SETTLE_MS, isLiveDeployment, sha, pullOf, once } from "./chain.ts";
+import { chainStack, REREAD, SETTLE_MS, isLiveDeployment, once } from "./chain.ts";
+import { sha, pullOf } from "./github.ts";
 
 const { github, pushed, until, managers, settled, verdictsOf } = chainStack();
 

tests/chain/unrouted.test.ts

@@ -1,7 +1,8 @@
 // A pull request opened while its listener is being replaced.
 import { expect, test } from "bun:test";
 import { TRIAGE_LISTENERS, VERDICT_LABELS } from "@corbits/triage-contracts";
-import { chainStack, UNROUTED, isLiveDeployment, sha, pullOf, comments, labelled, once } from "./chain.ts";
+import { chainStack, UNROUTED, isLiveDeployment, once } from "./chain.ts";
+import { sha, pullOf, comments, labelled } from "./github.ts";
 
 // Longer than the scenario runs, so only the hub's short retry and its pass on a listener starting can mail the head.
 const RECONCILE_INTERVAL_MS = 60 * 60_000;