From a12cefee8e2f9dc1fef806a600404592f1bfdee7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 23 Apr 2021 12:19:08 +0100
Subject: [PATCH] Tweak some tests

---
 src/Unread.js                  |  2 +-
 test/test-utils.js             | 11 +++++------
 test/utils/ShieldUtils-test.js |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Unread.js b/src/Unread.js
index ddf225ac64..12c15eb6af 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -45,7 +45,7 @@ export function eventTriggersUnreadCount(ev) {
 }
 
 export function doesRoomHaveUnreadMessages(room) {
-    const myUserId = MatrixClientPeg.get().credentials.userId;
+    const myUserId = MatrixClientPeg.get().getUserId();
 
     // get the most recent read receipt sent by our account.
     // N.B. this is NOT a read marker (RM, aka "read up to marker"),
diff --git a/test/test-utils.js b/test/test-utils.js
index 33f7e1626e..4fc9bdf377 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -224,7 +224,7 @@ export function mkStubRoom(roomId = null) {
         hasMembershipState: () => null,
         getVersion: () => '1',
         shouldUpgradeToVersion: () => null,
-        getMyMembership: () => "join",
+        getMyMembership: jest.fn().mockReturnValue("join"),
         maySendMessage: jest.fn().mockReturnValue(true),
         currentState: {
             getStateEvents: jest.fn(),
@@ -233,11 +233,7 @@ export function mkStubRoom(roomId = null) {
             maySendEvent: jest.fn().mockReturnValue(true),
             members: [],
         },
-        tags: {
-            "m.favourite": {
-                order: 0.5,
-            },
-        },
+        tags: {},
         setBlacklistUnverifiedDevices: jest.fn(),
         on: jest.fn(),
         removeListener: jest.fn(),
@@ -245,6 +241,9 @@ export function mkStubRoom(roomId = null) {
         getAvatarUrl: () => 'mxc://avatar.url/room.png',
         getMxcAvatarUrl: () => 'mxc://avatar.url/room.png',
         isSpaceRoom: jest.fn(() => false),
+        getUnreadNotificationCount: jest.fn(() => 0),
+        getEventReadUpTo: jest.fn(() => null),
+        timeline: [],
     };
 }
 
diff --git a/test/utils/ShieldUtils-test.js b/test/utils/ShieldUtils-test.js
index 8e3b19c1c4..bea3d26565 100644
--- a/test/utils/ShieldUtils-test.js
+++ b/test/utils/ShieldUtils-test.js
@@ -128,7 +128,7 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
 
 describe("shieldStatusForMembership other-trust behaviour", function() {
     beforeAll(() => {
-        DMRoomMap._sharedInstance = {
+        DMRoomMap.sharedInstance = {
             getUserIdForRoomId: (roomId) => roomId === "DM" ? "@any:h" : null,
         };
     });