Merge branch 'develop' into export-conversations

2021-09-22 18:07:01 +05:30 · 2021-09-22 18:07:01 +05:30 · 94e4fb71c1
commit 94e4fb71c1
parent b49c8ebf60 b13fdb698c
498 changed files with 13790 additions and 23008 deletions
--- a/test/test-utils.js
+++ b/test/test-utils.js
@ -85,9 +85,8 @@ export function createTestClient() {
        generateClientSecret: () => "t35tcl1Ent5ECr3T",
        isGuest: () => false,
        isCryptoEnabled: () => false,
-        getSpaceSummary: jest.fn().mockReturnValue({
+        getRoomHierarchy: jest.fn().mockReturnValue({
            rooms: [],
-            events: [],
        }),

        // Used by various internal bits we aren't concerned with (yet)