fix tests for weird asyncstore closure issues

Signed-off-by: Kerry Archibald <[email protected]>

Author: Kerry Archibald

src/stores/OwnBeaconStore.ts

@@ -50,12 +50,20 @@ export class OwnBeaconStore extends AsyncStoreWithClient<OwnBeaconStoreState> {
     }
 
     protected async onNotReady() {
-        await this.reset({});
+        this.matrixClient.removeListener(BeaconEvent.LivenessChange, this.onBeaconLiveness);
+        this.matrixClient.removeListener(BeaconEvent.New, this.onNewBeacon);
+
+        this.beacons.forEach(beacon => beacon.destroy());
+
+        this.beacons.clear();
+        this.beaconsByRoomId.clear();
+        this.liveBeaconIds = [];
     }
 
-    protected async onReady() {
+    protected async onReady(): Promise<void> {
         this.matrixClient.on(BeaconEvent.LivenessChange, this.onBeaconLiveness.bind(this));
         this.matrixClient.on(BeaconEvent.New, this.onNewBeacon.bind(this));
+
         this.initialiseBeaconState();
     }
 

test/stores/OwnBeaconStore-test.ts

@@ -17,6 +17,7 @@ limitations under the License.
 import { Room, Beacon, BeaconEvent } from "matrix-js-sdk/src/matrix";
 
 import { OwnBeaconStore, OwnBeaconStoreEvent } from "../../src/stores/OwnBeaconStore";
+import { resetAsyncStoreWithClient, setupAsyncStoreWithClient } from "../test-utils";
 import { makeBeaconInfoEvent } from "../test-utils/beacon";
 import { getMockClientWithEventEmitter } from "../test-utils/client";
 
@@ -69,15 +70,26 @@ describe('OwnBeaconStore', () => {
     };
 
     const makeOwnBeaconStore = async () => {
-        const store = new OwnBeaconStore();
-        // @ts-ignore
-        await store.onReady();
+        const store = OwnBeaconStore.instance;
+        // await resetAsyncStoreWithClient(store)
+
+        await setupAsyncStoreWithClient(store, mockClient);
         return store;
     };
 
     beforeEach(() => {
         mockClient.getVisibleRooms.mockReturnValue([]);
         jest.spyOn(global.Date, 'now').mockReturnValue(now);
+        jest.spyOn(OwnBeaconStore.instance, 'emit').mockRestore();
+    });
+
+    afterEach(async () => {
+        await resetAsyncStoreWithClient(OwnBeaconStore.instance);
+    });
+
+    it('works', async () => {
+        const store = await makeOwnBeaconStore();
+        expect(store.hasLiveBeacons()).toBe(false);
     });
 
     describe('onReady()', () => {
@@ -112,6 +124,31 @@ describe('OwnBeaconStore', () => {
         });
     });
 
+    describe('onNotReady()', () => {
+        it('removes listeners', async () => {
+            const store = await makeOwnBeaconStore();
+            const removeSpy = jest.spyOn(mockClient, 'removeListener');
+            // @ts-ignore
+            store.onNotReady();
+
+            expect(removeSpy.mock.calls[0]).toEqual(expect.arrayContaining([BeaconEvent.LivenessChange]));
+            expect(removeSpy.mock.calls[1]).toEqual(expect.arrayContaining([BeaconEvent.New]));
+        });
+
+        it('destroys beacons', async () => {
+            const [room1] = makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const beacon = room1.currentState.beacons.get(alicesRoom1BeaconInfo.getId());
+            const destroySpy = jest.spyOn(beacon, 'destroy');
+            // @ts-ignore
+            store.onNotReady();
+
+            expect(destroySpy).toHaveBeenCalled();
+        });
+    });
+
     describe('hasLiveBeacons()', () => {
         beforeEach(() => {
             makeRoomsWithStateEvents([