From bf0cbfead7871dddb9d4def12e4fcf3739341f46 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 8 May 2026 15:38:31 +0100
Subject: [PATCH] test: dedupe gateway hooks assertions

---
 src/gateway/hooks.test.ts | 44 +++++++--------------------------------
 1 file changed, 8 insertions(+), 36 deletions(-)

diff --git a/src/gateway/hooks.test.ts b/src/gateway/hooks.test.ts
index eea103203b0..3031b068ed8 100644
--- a/src/gateway/hooks.test.ts
+++ b/src/gateway/hooks.test.ts
@@ -41,10 +41,10 @@ const createIMessageAliasPlugin = () => ({
 describe("gateway hooks helpers", () => {
   const resolveHooksConfigOrThrow = (cfg: OpenClawConfig) => {
     const resolved = resolveHooksConfig(cfg);
-    expect(resolved).not.toBeNull();
     if (!resolved) {
       throw new Error("hooks config missing");
     }
+    expect(resolved.token).toBe(cfg.hooks?.token);
     return resolved;
   };
 
@@ -188,11 +188,7 @@ describe("gateway hooks helpers", () => {
         list: [{ id: "main", default: true }, { id: "hooks" }],
       },
     } as OpenClawConfig;
-    const resolved = resolveHooksConfig(cfg);
-    expect(resolved).not.toBeNull();
-    if (!resolved) {
-      return;
-    }
+    const resolved = resolveHooksConfigOrThrow(cfg);
     expect(resolveHookTargetAgentId(resolved, "hooks")).toBe("hooks");
     expect(resolveHookTargetAgentId(resolved, "missing-agent")).toBe("main");
     expect(resolveHookTargetAgentId(resolved, undefined)).toBeUndefined();
@@ -223,11 +219,7 @@ describe("gateway hooks helpers", () => {
     const cfg = {
       hooks: { enabled: true, token: "secret" },
     } as OpenClawConfig;
-    const resolved = resolveHooksConfig(cfg);
-    expect(resolved).not.toBeNull();
-    if (!resolved) {
-      return;
-    }
+    const resolved = resolveHooksConfigOrThrow(cfg);
     const denied = resolveHookSessionKey({
       hooksConfig: resolved,
       source: "request",
@@ -240,11 +232,7 @@ describe("gateway hooks helpers", () => {
     const cfg = {
       hooks: { enabled: true, token: "secret", allowRequestSessionKey: true },
     } as OpenClawConfig;
-    const resolved = resolveHooksConfig(cfg);
-    expect(resolved).not.toBeNull();
-    if (!resolved) {
-      return;
-    }
+    const resolved = resolveHooksConfigOrThrow(cfg);
     const allowed = resolveHookSessionKey({
       hooksConfig: resolved,
       source: "request",
@@ -262,11 +250,7 @@ describe("gateway hooks helpers", () => {
         allowedSessionKeyPrefixes: ["hook:"],
       },
     } as OpenClawConfig;
-    const resolved = resolveHooksConfig(cfg);
-    expect(resolved).not.toBeNull();
-    if (!resolved) {
-      return;
-    }
+    const resolved = resolveHooksConfigOrThrow(cfg);
 
     const blocked = resolveHookSessionKey({
       hooksConfig: resolved,
@@ -291,11 +275,7 @@ describe("gateway hooks helpers", () => {
         allowedSessionKeyPrefixes: ["hook:", "hook:gmail:"],
       },
     } as OpenClawConfig;
-    const resolved = resolveHooksConfig(cfg);
-    expect(resolved).not.toBeNull();
-    if (!resolved) {
-      return;
-    }
+    const resolved = resolveHooksConfigOrThrow(cfg);
 
     const denied = resolveHookSessionKey({
       hooksConfig: resolved,
@@ -313,11 +293,7 @@ describe("gateway hooks helpers", () => {
         allowedSessionKeyPrefixes: ["hook:", "hook:gmail:"],
       },
     } as OpenClawConfig;
-    const resolved = resolveHooksConfig(cfg);
-    expect(resolved).not.toBeNull();
-    if (!resolved) {
-      return;
-    }
+    const resolved = resolveHooksConfigOrThrow(cfg);
 
     const allowed = resolveHookSessionKey({
       hooksConfig: resolved,
@@ -335,11 +311,7 @@ describe("gateway hooks helpers", () => {
         defaultSessionKey: "hook:ingress",
       },
     } as OpenClawConfig;
-    const resolved = resolveHooksConfig(cfg);
-    expect(resolved).not.toBeNull();
-    if (!resolved) {
-      return;
-    }
+    const resolved = resolveHooksConfigOrThrow(cfg);
 
     const resolvedKey = resolveHookSessionKey({
       hooksConfig: resolved,