Repair pairing and cron validation fixtures

giodl73-repo · Copilot · giodl73-repo · commit 7a717251d25f · 2026-05-15T23:50:34.000-07:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/src/cron/service.skips-main-jobs-empty-systemevent-text.test.ts b/src/cron/service.skips-main-jobs-empty-systemevent-text.test.ts
@@ -5,6 +5,8 @@ import {
   createNoopLogger,
   withCronServiceForTest,
 } from "./service.test-harness.js";
+import { createCronServiceState } from "./service/state.js";
+import { executeJobCore } from "./service/timer.js";
 import type { CronJob } from "./types.js";
 
 const noopLogger = createNoopLogger();
@@ -60,6 +62,39 @@ describe("CronService", () => {
   });
 
   it("skips main jobs with empty systemEvent text", async () => {
+    const enqueueSystemEvent = vi.fn();
+    const requestHeartbeat = vi.fn();
+    const state = createCronServiceState({
+      cronEnabled: true,
+      storePath: "cron-empty-systemevent-test.json",
+      log: noopLogger,
+      nowMs: () => Date.now(),
+      enqueueSystemEvent,
+      requestHeartbeat,
+      runIsolatedAgentJob: vi.fn(async () => ({ status: "ok" as const })),
+    });
+    const job: CronJob = {
+      id: "empty-systemevent-test",
+      name: "empty systemEvent test",
+      enabled: true,
+      schedule: { kind: "at", at: "2025-12-13T00:00:01.000Z" },
+      sessionTarget: "main",
+      wakeMode: "now",
+      payload: { kind: "systemEvent", text: "   " },
+      createdAtMs: Date.now(),
+      updatedAtMs: Date.now(),
+      state: {},
+    };
+
+    const result = await executeJobCore(state, job);
+
+    expect(result.status).toBe("skipped");
+    expect(result.error).toMatch(/non-empty/i);
+    expect(enqueueSystemEvent).not.toHaveBeenCalled();
+    expect(requestHeartbeat).not.toHaveBeenCalled();
+  });
+
+  it("drops persisted main jobs with empty systemEvent text before they run", async () => {
     await withCronService(true, async ({ cron, enqueueSystemEvent, requestHeartbeat }) => {
       const atMs = Date.parse("2025-12-13T00:00:01.000Z");
       await cron.add({
@@ -77,9 +112,8 @@ describe("CronService", () => {
       expect(enqueueSystemEvent).not.toHaveBeenCalled();
       expect(requestHeartbeat).not.toHaveBeenCalled();
 
-      const job = await waitForFirstJob(cron, (current) => current?.state.lastStatus === "skipped");
-      expect(job?.state.lastStatus).toBe("skipped");
-      expect(job?.state.lastError).toMatch(/non-empty/i);
+      const job = await waitForFirstJob(cron, (current) => current === undefined);
+      expect(job).toBeUndefined();
     });
   });
 
diff --git a/src/cron/service/store.test.ts b/src/cron/service/store.test.ts
@@ -291,7 +291,7 @@ describe("cron service store seam coverage", () => {
     expect(findJobOrThrow(state, "reload-cron-expr-job").state.nextRunAtMs).toBe(dueNextRunAtMs);
   });
 
-  it("clears stale nextRunAtMs without throwing when a force-reloaded schedule is malformed", async () => {
+  it("skips a force-reloaded job when the persisted schedule is malformed", async () => {
     const { storePath } = await makeStorePath();
     const staleNextRunAtMs = STORE_TEST_NOW + 3_600_000;
 
@@ -316,9 +316,12 @@ describe("cron service store seam coverage", () => {
       undefined,
     );
 
-    const reloadedJob = findJobOrThrow(state, "reload-cron-expr-job");
-    expect(reloadedJob.schedule).toBe("0 17 * * *");
-    expect(reloadedJob.state.nextRunAtMs).toBeUndefined();
+    expect(state.store?.jobs.find((job) => job.id === "reload-cron-expr-job")).toBeUndefined();
+    expectWarnedJob({
+      storePath,
+      jobId: "reload-cron-expr-job",
+      message: "skipped invalid persisted job",
+    });
   });
 
   it("preserves nextRunAtMs after force reload when scheduling inputs are unchanged", async () => {
diff --git a/src/pairing/pairing-store.test.ts b/src/pairing/pairing-store.test.ts
@@ -301,7 +301,7 @@ async function expectPendingPairingRequestsIsolatedByAccount(params: {
 describe("pairing store", () => {
   it("skips malformed persisted pairing requests while approving valid codes", async () => {
     await withTempStateDir(async (stateDir) => {
-      const now = new Date("2026-05-16T05:20:00.000Z").toISOString();
+      const now = new Date().toISOString();
       writeJsonFixture(resolvePairingFilePath(stateDir, "telegram"), {
         version: 1,
         requests: [
