Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekable

* commit '2fb7794e6':
  changelog
  Make room alias lists peekable
  Add `allow_departed_users` param to `check_in_room_or_world_readable`
  Refactor the membership check methods in Auth

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py

index 2767b0497a..140cc0a3c2 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -122,11 +122,11 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
 
         self.room_members = []
 
-        def check_joined_room(room_id, user_id):
+        def check_user_in_room(room_id, user_id):
             if user_id not in [u.to_string() for u in self.room_members]:
                 raise AuthError(401, "User is not in the room")
 
-        hs.get_auth().check_joined_room = check_joined_room
+        hs.get_auth().check_user_in_room = check_user_in_room
 
         def get_joined_hosts_for_room(room_id):
             return set(member.domain for member in self.room_members)