From e4bb6e044d3ff87b5959409255c10e87d39c0364 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 19 Feb 2026 08:31:28 +0000
Subject: [PATCH] test(cron): dedupe delayed-timer job assertions

---
 src/cron/service.every-jobs-fire.test.ts | 66 +++++++++++++++---------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/src/cron/service.every-jobs-fire.test.ts b/src/cron/service.every-jobs-fire.test.ts
index b97edc0995..f1ef2d9eeb 100644
--- a/src/cron/service.every-jobs-fire.test.ts
+++ b/src/cron/service.every-jobs-fire.test.ts
@@ -14,6 +14,34 @@ const { makeStorePath } = createCronStoreHarness();
 installCronTestHooks({ logger: noopLogger });
 
 describe("CronService interval/cron jobs fire on time", () => {
+  const runLateTimerAndLoadJob = async ({
+    cron,
+    finished,
+    jobId,
+    firstDueAt,
+  }: {
+    cron: CronService;
+    finished: { waitForOk: (id: string) => Promise<unknown> };
+    jobId: string;
+    firstDueAt: number;
+  }) => {
+    vi.setSystemTime(new Date(firstDueAt + 5));
+    await vi.runOnlyPendingTimersAsync();
+    await finished.waitForOk(jobId);
+    const jobs = await cron.list({ includeDisabled: true });
+    return jobs.find((current) => current.id === jobId);
+  };
+
+  const expectMainSystemEvent = (
+    enqueueSystemEvent: ReturnType<typeof vi.fn>,
+    expectedText: string,
+  ) => {
+    expect(enqueueSystemEvent).toHaveBeenCalledWith(
+      expectedText,
+      expect.objectContaining({ agentId: undefined }),
+    );
+  };
+
   it("fires an every-type main job when the timer fires a few ms late", async () => {
     const store = await makeStorePath();
     const { cron, enqueueSystemEvent, finished } = createStartedCronServiceWithFinishedBarrier({
@@ -34,18 +62,13 @@ describe("CronService interval/cron jobs fire on time", () => {
     const firstDueAt = job.state.nextRunAtMs!;
     expect(firstDueAt).toBe(Date.parse("2025-12-13T00:00:00.000Z") + 10_000);
 
-    // Simulate setTimeout firing 5ms late (the race condition).
-    vi.setSystemTime(new Date(firstDueAt + 5));
-    await vi.runOnlyPendingTimersAsync();
-
-    await finished.waitForOk(job.id);
-    const jobs = await cron.list({ includeDisabled: true });
-    const updated = jobs.find((current) => current.id === job.id);
-
-    expect(enqueueSystemEvent).toHaveBeenCalledWith(
-      "tick",
-      expect.objectContaining({ agentId: undefined }),
-    );
+    const updated = await runLateTimerAndLoadJob({
+      cron,
+      finished,
+      jobId: job.id,
+      firstDueAt,
+    });
+    expectMainSystemEvent(enqueueSystemEvent, "tick");
     expect(updated?.state.lastStatus).toBe("ok");
     // nextRunAtMs must advance by at least one full interval past the due time.
     expect(updated?.state.nextRunAtMs).toBeGreaterThanOrEqual(firstDueAt + 10_000);
@@ -76,18 +99,13 @@ describe("CronService interval/cron jobs fire on time", () => {
 
     const firstDueAt = job.state.nextRunAtMs!;
 
-    // Simulate setTimeout firing 5ms late.
-    vi.setSystemTime(new Date(firstDueAt + 5));
-    await vi.runOnlyPendingTimersAsync();
-
-    await finished.waitForOk(job.id);
-    const jobs = await cron.list({ includeDisabled: true });
-    const updated = jobs.find((current) => current.id === job.id);
-
-    expect(enqueueSystemEvent).toHaveBeenCalledWith(
-      "cron-tick",
-      expect.objectContaining({ agentId: undefined }),
-    );
+    const updated = await runLateTimerAndLoadJob({
+      cron,
+      finished,
+      jobId: job.id,
+      firstDueAt,
+    });
+    expectMainSystemEvent(enqueueSystemEvent, "cron-tick");
     expect(updated?.state.lastStatus).toBe("ok");
     // nextRunAtMs should be the next whole-minute boundary (60s later).
     expect(updated?.state.nextRunAtMs).toBe(firstDueAt + 60_000);