Merge branch 'develop' into t3chguy/fix/17022

2021-04-27 11:16:02 +01:00 · 2021-04-27 11:16:02 +01:00 · f18a24025a
commit f18a24025a
parent 203425c8de 31b9a4c312
55 changed files with 1962 additions and 381 deletions
--- a/test/test-utils.js
+++ b/test/test-utils.js
@ -83,6 +83,13 @@ export function createTestClient() {
            rooms: [],
            events: [],
        }),
+
+        // Used by various internal bits we aren't concerned with (yet)
+        _sessionStore: {
+            store: {
+                getItem: jest.fn(),
+            },
+        },
    };
 }