From 434d589f3ee37a685a49426b9bf2a2ad0bbf84e4 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 12 May 2026 02:04:25 +0100
Subject: [PATCH] test: guard msteams authz mock calls

---
 .../message-handler.authz.test.ts             | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/extensions/msteams/src/monitor-handler/message-handler.authz.test.ts b/extensions/msteams/src/monitor-handler/message-handler.authz.test.ts
index 15d2a5dbbeb..fa2b8cb1935 100644
--- a/extensions/msteams/src/monitor-handler/message-handler.authz.test.ts
+++ b/extensions/msteams/src/monitor-handler/message-handler.authz.test.ts
@@ -268,8 +268,7 @@ describe("msteams monitor handler authz", () => {
     const { deps } = createDeps(createThreadAllowlistConfig({ groupAllowFrom: ["alice-aad"] }));
     const handler = createMSTeamsMessageHandler(deps);
     await handler(createChannelThreadActivity({ attachments: [createQuoteAttachment()] }));
-    return runtimeApiMockState.dispatchReplyFromConfigWithSettledDispatcher.mock.calls[0]?.[0]
-      ?.ctxPayload;
+    return firstSettledDispatch().ctxPayload;
   }
 
   function recordFromMockCall(value: unknown): Record<string, unknown> {
@@ -288,6 +287,15 @@ describe("msteams monitor handler authz", () => {
     return call[argIndex];
   }
 
+  function firstSettledDispatch(): { ctxPayload?: unknown } {
+    const dispatched = mockCallArg(
+      runtimeApiMockState.dispatchReplyFromConfigWithSettledDispatcher,
+      0,
+      0,
+    );
+    return recordFromMockCall(dispatched) as { ctxPayload?: unknown };
+  }
+
   function logMeta(logFn: unknown, message: string): Record<string, unknown> {
     const calls = (logFn as { mock?: { calls?: Array<[unknown, unknown?]> } }).mock?.calls ?? [];
     const call = calls.find(([loggedMessage]) => loggedMessage === message);
@@ -624,8 +632,7 @@ describe("msteams monitor handler authz", () => {
     await handler(createAttackerGroupActivity({ text: "/config set foo bar" }));
 
     expect(conversationStore.upsert).toHaveBeenCalled();
-    const dispatched =
-      runtimeApiMockState.dispatchReplyFromConfigWithSettledDispatcher.mock.calls[0]?.[0];
+    const dispatched = firstSettledDispatch();
     expect(recordFromMockCall(dispatched?.ctxPayload).CommandAuthorized).toBe(true);
   });
 
@@ -655,11 +662,7 @@ describe("msteams monitor handler authz", () => {
     const handler = createMSTeamsMessageHandler(deps);
     await handler(createChannelThreadActivity());
 
-    const dispatched =
-      runtimeApiMockState.dispatchReplyFromConfigWithSettledDispatcher.mock.calls[0]?.[0];
-    if (!dispatched) {
-      throw new Error("expected authorized thread message to dispatch");
-    }
+    const dispatched = firstSettledDispatch();
     const ctxPayload = recordFromMockCall(dispatched.ctxPayload);
     expect(ctxPayload.BodyForAgent).toBe(
       "[Thread history]\nAlice: Allowed context\n[/Thread history]\n\nCurrent message",
@@ -699,8 +702,7 @@ describe("msteams monitor handler authz", () => {
     const handler = createMSTeamsMessageHandler(deps);
     await handler(createChannelThreadActivity());
 
-    const dispatched =
-      runtimeApiMockState.dispatchReplyFromConfigWithSettledDispatcher.mock.calls[0]?.[0];
+    const dispatched = firstSettledDispatch();
     expect(recordFromMockCall(dispatched?.ctxPayload).BodyForAgent).toBe(
       "[Thread history]\nAlice: Allowlisted by display name\n[/Thread history]\n\nCurrent message",
     );