@@ -159,37 +159,56 @@ describe("fetchRouterModels", () => {
159159
160160 it("rejects and cleans up when signal aborts while waiting", async () => {
161161 const controller = new AbortController()
162- const removeEventListenerSpy = vi.spyOn(window, "removeEventListener")
162+ const addWindowListenerSpy = vi.spyOn(window, "addEventListener")
163+ const removeWindowListenerSpy = vi.spyOn(window, "removeEventListener")
164+ const addSignalListenerSpy = vi.spyOn(controller.signal, "addEventListener")
165+ const removeSignalListenerSpy = vi.spyOn(controller.signal, "removeEventListener")
163166
164167 const promise = fetchRouterModels(providerIdentifiers.openrouter, controller.signal)
168+ const addedMessageHandler = addWindowListenerSpy.mock.calls.find(([type]) => type === "message")?.[1]
169+ const addedAbortHandler = addSignalListenerSpy.mock.calls.find(([type]) => type === "abort")?.[1]
165170
166171 controller.abort()
167172
168173 await expect(promise).rejects.toThrow("Router models request aborted")
169- expect(removeEventListenerSpy).toHaveBeenCalledWith("message", expect.any(Function))
174+ expect(typeof addedMessageHandler).toBe("function")
175+ expect(removeWindowListenerSpy).toHaveBeenCalledWith("message", addedMessageHandler)
176+ expect(typeof addedAbortHandler).toBe("function")
177+ expect(removeSignalListenerSpy).toHaveBeenCalledWith("abort", addedAbortHandler)
170178 })
171179
172180 it("rejects and cleans up abort listener when timeout expires", async () => {
173181 vi.useFakeTimers()
174182 const controller = new AbortController()
175- const signalRemoveEventListenerSpy = vi.spyOn(controller.signal, "removeEventListener")
176- const windowRemoveEventListenerSpy = vi.spyOn(window, "removeEventListener")
183+ const addSignalListenerSpy = vi.spyOn(controller.signal, "addEventListener")
184+ const removeSignalListenerSpy = vi.spyOn(controller.signal, "removeEventListener")
185+ const addWindowListenerSpy = vi.spyOn(window, "addEventListener")
186+ const removeWindowListenerSpy = vi.spyOn(window, "removeEventListener")
177187
178188 const promise = fetchRouterModels(providerIdentifiers.openrouter, controller.signal)
189+ const addedAbortHandler = addSignalListenerSpy.mock.calls.find(([type]) => type === "abort")?.[1]
190+ const addedMessageHandler = addWindowListenerSpy.mock.calls.find(([type]) => type === "message")?.[1]
179191
180192 vi.advanceTimersByTime(10000)
181193
182194 await expect(promise).rejects.toThrow("Router models request timed out")
183- expect(signalRemoveEventListenerSpy).toHaveBeenCalledWith("abort", expect.any(Function))
184- expect(windowRemoveEventListenerSpy).toHaveBeenCalledWith("message", expect.any(Function))
195+ expect(typeof addedAbortHandler).toBe("function")
196+ expect(removeSignalListenerSpy).toHaveBeenCalledWith("abort", addedAbortHandler)
197+ expect(typeof addedMessageHandler).toBe("function")
198+ expect(removeWindowListenerSpy).toHaveBeenCalledWith("message", addedMessageHandler)
185199 })
186200
187201 it("removes abort listener and cleans up timer on successful response", async () => {
188202 vi.useFakeTimers()
189203 const controller = new AbortController()
190- const signalRemoveEventListenerSpy = vi.spyOn(controller.signal, "removeEventListener")
204+ const addSignalListenerSpy = vi.spyOn(controller.signal, "addEventListener")
205+ const removeSignalListenerSpy = vi.spyOn(controller.signal, "removeEventListener")
206+ const addWindowListenerSpy = vi.spyOn(window, "addEventListener")
207+ const removeWindowListenerSpy = vi.spyOn(window, "removeEventListener")
191208
192209 const promise = fetchRouterModels(providerIdentifiers.openrouter, controller.signal)
210+ const addedAbortHandler = addSignalListenerSpy.mock.calls.find(([type]) => type === "abort")?.[1]
211+ const addedMessageHandler = addWindowListenerSpy.mock.calls.find(([type]) => type === "message")?.[1]
193212
194213 window.dispatchEvent(
195214 new MessageEvent("message", {
@@ -203,7 +222,10 @@ describe("fetchRouterModels", () => {
203222
204223 const result = await promise
205224 expect(result).toEqual(mockRouterModels)
206- expect(signalRemoveEventListenerSpy).toHaveBeenCalledWith("abort", expect.any(Function))
225+ expect(typeof addedAbortHandler).toBe("function")
226+ expect(removeSignalListenerSpy).toHaveBeenCalledWith("abort", addedAbortHandler)
227+ expect(typeof addedMessageHandler).toBe("function")
228+ expect(removeWindowListenerSpy).toHaveBeenCalledWith("message", addedMessageHandler)
207229
208230 // Advancing timers should not cause rejection or error
209231 vi.advanceTimersByTime(15000)
0 commit comments