test: guard plugin diagnostic assertions

steipete · steipete · commit 3dd2c1a8b850 · 2026-05-11T20:07:14.000+01:00
diff --git a/src/plugins/contracts/host-hooks.contract.test.ts b/src/plugins/contracts/host-hooks.contract.test.ts
@@ -76,7 +76,9 @@ function diagnosticSummaries(diagnostics: readonly unknown[]) {
 }
 
 function expectRecordFields(record: unknown, expected: Record<string, unknown>) {
-  expect(record).toBeDefined();
+  if (!record || typeof record !== "object") {
+    throw new Error("Expected record");
+  }
   const actual = record as Record<string, unknown>;
   for (const [key, value] of Object.entries(expected)) {
     expect(actual[key]).toEqual(value);
diff --git a/src/plugins/contracts/scheduled-turns.contract.test.ts b/src/plugins/contracts/scheduled-turns.contract.test.ts
@@ -131,8 +131,10 @@ function mockCronAdd(response: CronJob) {
 
 function getCronAddBody() {
   const addCall = workflowMocks.cronAdd.mock.calls[0];
-  expect(addCall).toBeDefined();
-  return addCall?.[0] as CronJobCreate;
+  if (!addCall) {
+    throw new Error("Expected cron add call");
+  }
+  return addCall[0] as CronJobCreate;
 }
 
 function expectSessionTurnHandle(
diff --git a/src/plugins/discovery.test.ts b/src/plugins/discovery.test.ts
@@ -343,7 +343,6 @@ function expectCandidateFields(
     | undefined,
   expected: Record<string, unknown>,
 ) {
-  expect(candidate).toBeDefined();
   if (!candidate) {
     throw new Error("Expected plugin candidate");
   }
@@ -1869,7 +1868,9 @@ describe("discoverOpenClawPlugins", () => {
             (entry.source ?? "").endsWith("alias-dir") &&
             entry.message.includes("blocked plugin candidate: world-writable path"),
         );
-        expect(diagnostic).toBeDefined();
+        if (!diagnostic) {
+          throw new Error("Expected world-writable plugin candidate diagnostic");
+        }
       } finally {
         fs.chmodSync(pluginDir, 0o755);
       }
diff --git a/src/plugins/manifest-registry.test.ts b/src/plugins/manifest-registry.test.ts
@@ -175,7 +175,9 @@ function expectDiagnosticFields(
     }
     return true;
   });
-  expect(diagnostic, `diagnostic ${expected.messageIncludes ?? ""}`).toBeDefined();
+  if (!diagnostic) {
+    throw new Error(`Expected diagnostic ${expected.messageIncludes ?? ""}`);
+  }
 }
 
 function prepareLinkedManifestFixture(params: { id: string; mode: "symlink" | "hardlink" }): {
diff --git a/src/plugins/plugin-registry-snapshot.test.ts b/src/plugins/plugin-registry-snapshot.test.ts
@@ -96,7 +96,6 @@ function requirePluginRecord(
   pluginId: string,
 ): InstalledPluginIndex["plugins"][number] {
   const plugin = plugins.find((candidate) => candidate.pluginId === pluginId);
-  expect(plugin, `plugin ${pluginId}`).toBeDefined();
   if (!plugin) {
     throw new Error(`expected plugin ${pluginId}`);
   }
diff --git a/src/plugins/uninstall.test.ts b/src/plugins/uninstall.test.ts
@@ -246,8 +246,10 @@ async function expectPathAccessState(pathToCheck: string, expected: "exists" | "
 
 function expectNpmUninstallCommand(params: { packageName: string; npmRoot: string }) {
   const command = runCommandWithTimeoutMock.mock.calls[0];
-  expect(command).toBeDefined();
-  expect(command?.[0]).toEqual([
+  if (!command) {
+    throw new Error("Expected npm uninstall command");
+  }
+  expect(command[0]).toEqual([
     "npm",
     "uninstall",
     "--loglevel=error",
diff --git a/src/plugins/update.test.ts b/src/plugins/update.test.ts
@@ -766,7 +766,9 @@ describe("updateNpmInstalledPlugins", () => {
       "dist.shasum",
       "--json",
     ]);
-    expect(npmViewCall()?.[1]).toBeDefined();
+    if (npmViewCall()?.[1] === undefined) {
+      throw new Error("Expected npm view command options");
+    }
     expect(installPluginFromNpmSpecMock).not.toHaveBeenCalled();
     expect(result.changed).toBe(false);
     expect(result.config).toBe(config);

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,9 @@ function expectDiagnosticFields(`
`175`	`175`	`}`
`176`	`176`	`return true;`
`177`	`177`	`});`
`178`		- expect(diagnostic, `diagnostic ${expected.messageIncludes ?? ""}`).toBeDefined();
	`178`	`+ if (!diagnostic) {`
	`179`	+ throw new Error(`Expected diagnostic ${expected.messageIncludes ?? ""}`);
	`180`	`+ }`
`179`	`181`	`}`
`180`	`182`
`181`	`183`	`function prepareLinkedManifestFixture(params: { id: string; mode: "symlink" \| "hardlink" }): {`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ function requirePluginRecord(`
`96`	`96`	`pluginId: string,`
`97`	`97`	`): InstalledPluginIndex["plugins"][number] {`
`98`	`98`	`const plugin = plugins.find((candidate) => candidate.pluginId === pluginId);`
`99`		- expect(plugin, `plugin ${pluginId}`).toBeDefined();
`100`	`99`	`if (!plugin) {`
`101`	`100`	throw new Error(`expected plugin ${pluginId}`);
`102`	`101`	`}`