test(gateway): align tests with upstream type/shape changes after rebase

davidangularme · davidangularme · commit 779f657ed02e · 2026-04-30T06:19:52.000+03:00
After rebasing onto upstream main, two test surfaces drifted:

1. GatewayRequestContextParams gained two required fields upstream
   (getRuntimeConfig, broadcastVoiceWakeRoutingChanged). The
   makeContextParams test helper was missing them, so every consumer
   tripped tsgo with a missing-field error. Add both as vi.fn()
   stubs.

2. revokeDeviceToken's return shape changed upstream from a bare
   entry record to a discriminated union {ok: true, entry: ...} | {ok:
   false, reason}. The new device.token.revoke synchronous-invalidate
   test still mocked the old shape, so the production handler took the
   !revoked.ok branch and never reached the invalidateClientsForDevice
   call the test asserted. Update the mock to the new union shape.

Also fix three new Set([...] as never) sites in server-request-
context.test.ts that produced Set&lt;unknown&gt; rather than Set&lt;never&gt;.
Move the cast outside the Set constructor so the literal stays
inferred while the wrapper is type-erased to never, which is
assignable to the Partial&lt;GatewayRequestContextParams&gt; clients field.
diff --git a/src/gateway/server-methods/devices.test.ts b/src/gateway/server-methods/devices.test.ts
@@ -352,7 +352,10 @@ describe("deviceHandlers", () => {
   });
 
   it("invalidates affected clients synchronously before responding to device.token.revoke", async () => {
-    revokeDeviceTokenMock.mockResolvedValue({ role: "operator", revokedAtMs: 456 });
+    revokeDeviceTokenMock.mockResolvedValue({
+      ok: true,
+      entry: { role: "operator", revokedAtMs: 456 },
+    });
     const opts = createOptions(
       "device.token.revoke",
       { deviceId: "device-1", role: "operator" },
diff --git a/src/gateway/server-request-context.test.ts b/src/gateway/server-request-context.test.ts
@@ -18,6 +18,7 @@ function makeContextParams(
   return {
     deps: {} as never,
     runtimeState,
+    getRuntimeConfig: vi.fn(() => ({}) as never),
     execApprovalManager: undefined,
     pluginApprovalManager: undefined,
     loadGatewayModelCatalog: vi.fn(async () => []),
@@ -63,6 +64,7 @@ function makeContextParams(
     markChannelLoggedOut: vi.fn(),
     wizardRunner: vi.fn(async () => undefined),
     broadcastVoiceWakeChanged: vi.fn(),
+    broadcastVoiceWakeRoutingChanged: vi.fn(),
     unavailableGatewayMethods: new Set(),
     ...overrides,
   };
@@ -157,7 +159,7 @@ describe("createGatewayRequestContext", () => {
       connect: { device: { id: "device-2" }, role: "primary" },
       socket: { close: vi.fn() },
     };
-    const clients = new Set([target, unrelated] as never);
+    const clients = new Set([target, unrelated]) as never;
 
     const context = createGatewayRequestContext(makeContextParams({ clients }));
     context.invalidateClientsForDevice?.("device-1", { reason: "device-token-rotated" });
@@ -178,7 +180,7 @@ describe("createGatewayRequestContext", () => {
       connect: { device: { id: "device-1" }, role: "primary" },
       socket: { close: vi.fn() },
     };
-    const clients = new Set([target] as never);
+    const clients = new Set([target]) as never;
 
     const context = createGatewayRequestContext(makeContextParams({ clients }));
     context.disconnectClientsForDevice?.("device-1");
@@ -199,7 +201,7 @@ describe("createGatewayRequestContext", () => {
       connect: { device: { id: "device-1" }, role: "secondary" },
       socket: { close: vi.fn() },
     };
-    const clients = new Set([primary, secondary] as never);
+    const clients = new Set([primary, secondary]) as never;
 
     const context = createGatewayRequestContext(makeContextParams({ clients }));
     context.invalidateClientsForDevice?.("device-1", { role: "primary" });
