From 2c576a7477d509a293e9bf59b48359934816cf26 Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Wed, 8 Oct 2025 18:58:03 -0400
Subject: [PATCH] Clean up subscriptions in Connection tests

---
 src/state/Connection.test.ts | 44 +++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/state/Connection.test.ts b/src/state/Connection.test.ts
index ecafb5ee..14c42206 100644
--- a/src/state/Connection.test.ts
+++ b/src/state/Connection.test.ts
@@ -12,6 +12,7 @@ import {
   it,
   type Mock,
   type MockedObject,
+  onTestFinished,
   vi,
 } from "vitest";
 import { BehaviorSubject, of } from "rxjs";
@@ -179,9 +180,10 @@ describe("Start connection states", () => {
     const connection = new RemoteConnection(opts, undefined);
 
     const capturedStates: FocusConnectionState[] = [];
-    connection.focusConnectionState$.subscribe((value) => {
+    const s = connection.focusConnectionState$.subscribe((value) => {
       capturedStates.push(value);
     });
+    onTestFinished(() => s.unsubscribe());
 
     const deferred = Promise.withResolvers<IOpenIDToken>();
 
@@ -231,9 +233,10 @@ describe("Start connection states", () => {
     const connection = new RemoteConnection(opts, undefined);
 
     const capturedStates: FocusConnectionState[] = [];
-    connection.focusConnectionState$.subscribe((value) => {
+    const s = connection.focusConnectionState$.subscribe((value) => {
       capturedStates.push(value);
     });
+    onTestFinished(() => s.unsubscribe());
 
     const deferredSFU = Promise.withResolvers<void>();
     // mock the /sfu/get call
@@ -287,9 +290,10 @@ describe("Start connection states", () => {
     const connection = new RemoteConnection(opts, undefined);
 
     const capturedStates: FocusConnectionState[] = [];
-    connection.focusConnectionState$.subscribe((value) => {
+    const s = connection.focusConnectionState$.subscribe((value) => {
       capturedStates.push(value);
     });
+    onTestFinished(() => s.unsubscribe());
 
     const deferredSFU = Promise.withResolvers<void>();
     // mock the /sfu/get call
@@ -342,21 +346,22 @@ describe("Start connection states", () => {
 
     const connection = setupRemoteConnection();
 
-    const capturedState: FocusConnectionState[] = [];
-    connection.focusConnectionState$.subscribe((value) => {
-      capturedState.push(value);
+    const capturedStates: FocusConnectionState[] = [];
+    const s = connection.focusConnectionState$.subscribe((value) => {
+      capturedStates.push(value);
     });
+    onTestFinished(() => s.unsubscribe());
 
     await connection.start();
     await vi.runAllTimersAsync();
 
-    const initialState = capturedState.shift();
+    const initialState = capturedStates.shift();
     expect(initialState?.state).toEqual("Initialized");
-    const fetchingState = capturedState.shift();
+    const fetchingState = capturedStates.shift();
     expect(fetchingState?.state).toEqual("FetchingConfig");
-    const connectingState = capturedState.shift();
+    const connectingState = capturedStates.shift();
     expect(connectingState?.state).toEqual("ConnectingToLkRoom");
-    const connectedState = capturedState.shift();
+    const connectedState = capturedStates.shift();
     expect(connectedState?.state).toEqual("ConnectedToLkRoom");
   });
 
@@ -367,10 +372,11 @@ describe("Start connection states", () => {
 
     await connection.start();
 
-    let capturedState: FocusConnectionState[] = [];
-    connection.focusConnectionState$.subscribe((value) => {
-      capturedState.push(value);
+    let capturedStates: FocusConnectionState[] = [];
+    const s = connection.focusConnectionState$.subscribe((value) => {
+      capturedStates.push(value);
     });
+    onTestFinished(() => s.unsubscribe());
 
     const states = [
       ConnectionState.Disconnected,
@@ -386,7 +392,7 @@ describe("Start connection states", () => {
     }
 
     for (const state of states) {
-      const s = capturedState.shift();
+      const s = capturedStates.shift();
       expect(s?.state).toEqual("ConnectedToLkRoom");
       const connectedState = s as FocusConnectionState & {
         state: "ConnectedToLkRoom";
@@ -404,12 +410,12 @@ describe("Start connection states", () => {
 
     // If the state is not ConnectedToLkRoom, no events should be relayed anymore
     await connection.stop();
-    capturedState = [];
+    capturedStates = [];
     for (const state of states) {
       fakeRoomEventEmiter.emit(RoomEvent.ConnectionStateChanged, state);
     }
 
-    expect(capturedState.length).toEqual(0);
+    expect(capturedStates.length).toEqual(0);
   });
 
   it("shutting down the scope should stop the connection", async () => {
@@ -452,7 +458,7 @@ describe("Publishing participants observations", () => {
       participant: RemoteParticipant;
       membership: CallMembership;
     }[][] = [];
-    connection.publishingParticipants$.subscribe((publishers) => {
+    const s = connection.publishingParticipants$.subscribe((publishers) => {
       observedPublishers.push(publishers);
       if (
         publishers.some(
@@ -469,6 +475,7 @@ describe("Publishing participants observations", () => {
         danIsAPublisher.resolve();
       }
     });
+    onTestFinished(() => s.unsubscribe());
     // The publishingParticipants$ observable is derived from the current members of the
     // livekitRoom and the rtc membership in order to publish the members that are publishing
     // on this connection.
@@ -578,9 +585,10 @@ describe("Publishing participants observations", () => {
       participant: RemoteParticipant;
       membership: CallMembership;
     }[][] = [];
-    connection.publishingParticipants$.subscribe((publishers) => {
+    const s = connection.publishingParticipants$.subscribe((publishers) => {
       observedPublishers.push(publishers);
     });
+    onTestFinished(() => s.unsubscribe());
 
     let participants: RemoteParticipant[] = [
       fakeRemoteLivekitParticipant("@bob:example.org:DEV111"),