test: consolidate strict-503 skip-message matcher into a shared helper

jpr5 · jpr5 · commit f21e718caa91 · 2026-06-09T17:51:12.000-07:00
The "candidate fixture(s) skipped by sequence/turn state" regex was duplicated
10x across test files, each re-encoding the message built by
strictNoMatchMessage in src/helpers.ts. Move it to a single
SKIPPED_BY_STATE_RE in src/__tests__/helpers/strict-matchers.ts with an
import-time drift guard against strictNoMatchMessage(1), and import it at all
former duplication sites.
diff --git a/src/__tests__/bedrock.test.ts b/src/__tests__/bedrock.test.ts
@@ -6,6 +6,7 @@ import { bedrockToCompletionRequest, handleBedrock, handleBedrockStream } from "
 import { Journal } from "../journal.js";
 import { Logger } from "../logger.js";
 import { createMockReq, createMockRes, createDefaults } from "./helpers/mock-res.js";
+import { SKIPPED_BY_STATE_RE } from "./helpers/strict-matchers.js";
 
 // --- helpers ---
 
@@ -1551,7 +1552,7 @@ describe("POST /model/{modelId}/invoke (strict mode)", () => {
     );
     expect(res.status).toBe(503);
     const body = JSON.parse(res.body);
-    expect(body.error.message).toMatch(/candidate fixture\(s\) skipped by sequence\/turn state/);
+    expect(body.error.message).toMatch(SKIPPED_BY_STATE_RE);
   });
 });
 
@@ -1845,6 +1846,6 @@ describe("POST /model/{modelId}/converse (strict mode)", () => {
     );
     expect(res.status).toBe(503);
     const body = JSON.parse(res.body);
-    expect(body.error.message).toMatch(/candidate fixture\(s\) skipped by sequence\/turn state/);
+    expect(body.error.message).toMatch(SKIPPED_BY_STATE_RE);
   });
 });
diff --git a/src/__tests__/cohere.test.ts b/src/__tests__/cohere.test.ts
@@ -5,6 +5,7 @@ import { createServer, type ServerInstance } from "../server.js";
 import { cohereToCompletionRequest, handleCohere } from "../cohere.js";
 import { Journal } from "../journal.js";
 import { Logger } from "../logger.js";
+import { SKIPPED_BY_STATE_RE } from "./helpers/strict-matchers.js";
 
 // --- helpers ---
 
@@ -871,7 +872,7 @@ describe("POST /v2/chat (strict mode)", () => {
     });
     expect(res.status).toBe(503);
     const body = JSON.parse(res.body);
-    expect(body.error.message).toMatch(/candidate fixture\(s\) skipped by sequence\/turn state/);
+    expect(body.error.message).toMatch(SKIPPED_BY_STATE_RE);
   });
 });
 
diff --git a/src/__tests__/gemini-interactions.test.ts b/src/__tests__/gemini-interactions.test.ts
@@ -15,6 +15,7 @@ import {
 } from "../gemini-interactions.js";
 import { collapseGeminiInteractionsSSE } from "../stream-collapse.js";
 import { Logger } from "../logger.js";
+import { SKIPPED_BY_STATE_RE } from "./helpers/strict-matchers.js";
 
 // --- helpers ---
 
@@ -1017,7 +1018,7 @@ describe("Gemini Interactions — non-streaming", () => {
     });
     expect(res.status).toBe(503);
     const body = JSON.parse(res.body);
-    expect(body.error.message).toMatch(/candidate fixture\(s\) skipped by sequence\/turn state/);
+    expect(body.error.message).toMatch(SKIPPED_BY_STATE_RE);
   });
 
   it("matches userMessage fixture when input is Step[] envelope (issue #228)", async () => {
diff --git a/src/__tests__/gemini.test.ts b/src/__tests__/gemini.test.ts
@@ -3,6 +3,7 @@ import * as http from "node:http";
 import type { Fixture } from "../types.js";
 import { createServer, type ServerInstance } from "../server.js";
 import { geminiToCompletionRequest } from "../gemini.js";
+import { SKIPPED_BY_STATE_RE } from "./helpers/strict-matchers.js";
 
 // --- helpers ---
 
@@ -1168,7 +1169,7 @@ describe("Gemini strict mode", () => {
     });
     expect(res.status).toBe(503);
     const body = JSON.parse(res.body);
-    expect(body.error.message).toMatch(/candidate fixture\(s\) skipped by sequence\/turn state/);
+    expect(body.error.message).toMatch(SKIPPED_BY_STATE_RE);
   });
 });
 
diff --git a/src/__tests__/helpers/strict-matchers.ts b/src/__tests__/helpers/strict-matchers.ts
@@ -0,0 +1,16 @@
+import { strictNoMatchMessage } from "../../helpers.js";
+
+/**
+ * Shared matcher for the strict-mode 503 "skipped by sequence/turn state"
+ * message built by `strictNoMatchMessage` (src/helpers.ts). Import this
+ * instead of re-encoding the message text in individual test files.
+ */
+export const SKIPPED_BY_STATE_RE = /candidate fixture\(s\) skipped by sequence\/turn state/;
+
+// Drift guard: fail loudly at import time if the matcher no longer matches the
+// message actually produced by the source of truth.
+if (!SKIPPED_BY_STATE_RE.test(strictNoMatchMessage(1))) {
+  throw new Error(
+    `SKIPPED_BY_STATE_RE is out of sync with strictNoMatchMessage(): ${strictNoMatchMessage(1)}`,
+  );
+}
diff --git a/src/__tests__/messages.test.ts b/src/__tests__/messages.test.ts
@@ -6,6 +6,7 @@ import { createServer, type ServerInstance } from "../server.js";
 import { claudeToCompletionRequest, handleMessages } from "../messages.js";
 import { Journal } from "../journal.js";
 import { Logger } from "../logger.js";
+import { SKIPPED_BY_STATE_RE } from "./helpers/strict-matchers.js";
 
 // --- helpers ---
 
@@ -1138,7 +1139,7 @@ describe("POST /v1/messages (strict mode)", () => {
     });
     expect(res.status).toBe(503);
     const body = JSON.parse(res.body);
-    expect(body.error.message).toMatch(/candidate fixture\(s\) skipped by sequence\/turn state/);
+    expect(body.error.message).toMatch(SKIPPED_BY_STATE_RE);
   });
 });
 
diff --git a/src/__tests__/ollama.test.ts b/src/__tests__/ollama.test.ts
@@ -6,6 +6,7 @@ import { ollamaToCompletionRequest, handleOllama, handleOllamaGenerate } from ".
 import { writeNDJSONStream } from "../ndjson-writer.js";
 import { Journal } from "../journal.js";
 import { Logger } from "../logger.js";
+import { SKIPPED_BY_STATE_RE } from "./helpers/strict-matchers.js";
 
 // --- helpers ---
 
@@ -1019,7 +1020,7 @@ describe("POST /api/chat (strict mode)", () => {
     });
     expect(res.status).toBe(503);
     const body = JSON.parse(res.body);
-    expect(body.error.message).toMatch(/candidate fixture\(s\) skipped by sequence\/turn state/);
+    expect(body.error.message).toMatch(SKIPPED_BY_STATE_RE);
   });
 });
 
diff --git a/src/__tests__/responses.test.ts b/src/__tests__/responses.test.ts
@@ -12,6 +12,7 @@ import {
 } from "../responses.js";
 import { Journal } from "../journal.js";
 import { Logger } from "../logger.js";
+import { SKIPPED_BY_STATE_RE } from "./helpers/strict-matchers.js";
 
 // --- helpers ---
 
@@ -1030,7 +1031,7 @@ describe("POST /v1/responses (strict mode)", () => {
     });
     expect(res.status).toBe(503);
     const body = JSON.parse(res.body);
-    expect(body.error.message).toMatch(/candidate fixture\(s\) skipped by sequence\/turn state/);
+    expect(body.error.message).toMatch(SKIPPED_BY_STATE_RE);
   });
 });
 
diff --git a/src/__tests__/strict-no-match-diagnostic.test.ts b/src/__tests__/strict-no-match-diagnostic.test.ts
@@ -4,6 +4,7 @@ import { matchFixtureDiagnostic } from "../router.js";
 import { strictNoMatchMessage } from "../helpers.js";
 import { createServer, type ServerInstance } from "../server.js";
 import type { Fixture, ChatCompletionRequest } from "../types.js";
+import { SKIPPED_BY_STATE_RE } from "./helpers/strict-matchers.js";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -48,8 +49,6 @@ function chatRequest(userContent: string): ChatCompletionRequest {
   };
 }
 
-const SKIPPED_RE = /candidate fixture\(s\) skipped by sequence\/turn state/;
-
 // ---------------------------------------------------------------------------
 // Unit tests: strictNoMatchMessage helper
 // ---------------------------------------------------------------------------
@@ -213,7 +212,7 @@ describe("strict-mode 503 sequence/turn disambiguation", () => {
     const res = await httpPost(`${server.url}/v1/chat/completions`, chatRequest("hello"));
     expect(res.status).toBe(503);
     const body = JSON.parse(res.body);
-    expect(body.error.message).toMatch(SKIPPED_RE);
+    expect(body.error.message).toMatch(SKIPPED_BY_STATE_RE);
     expect(body.error.type).toBe("invalid_request_error");
   });
 
@@ -226,7 +225,7 @@ describe("strict-mode 503 sequence/turn disambiguation", () => {
     const res = await httpPost(`${server.url}/v1/chat/completions`, chatRequest("hello"));
     expect(res.status).toBe(503);
     const body = JSON.parse(res.body);
-    expect(body.error.message).toMatch(SKIPPED_RE);
+    expect(body.error.message).toMatch(SKIPPED_BY_STATE_RE);
     expect(body.error.type).toBe("invalid_request_error");
   });
 
diff --git a/src/__tests__/ws-responses.test.ts b/src/__tests__/ws-responses.test.ts
@@ -2,6 +2,7 @@ import { describe, it, expect, afterEach } from "vitest";
 import { createServer, type ServerInstance } from "../server.js";
 import type { Fixture } from "../types.js";
 import { connectWebSocket } from "./ws-test-client.js";
+import { SKIPPED_BY_STATE_RE } from "./helpers/strict-matchers.js";
 
 // --- fixtures ---
 
@@ -517,7 +518,7 @@ describe("WebSocket /v1/responses", () => {
     ws2.send(responseCreateMsg("hello"));
     const close = await ws2.waitForCloseFrame();
     expect(close.code).toBe(1008);
-    expect(close.reason).toMatch(/candidate fixture\(s\) skipped by sequence\/turn state/);
+    expect(close.reason).toMatch(SKIPPED_BY_STATE_RE);
   });
 
   it("streams reasoning events before text via WebSocket", async () => {
