summary refs log tree commit diff
path: root/tests/handlers
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-08-09 14:44:28 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-08-09 14:44:28 +0100
commitf8e86b7d2e8670e9688db806ff5a9b97c9ad5365 (patch)
treefd9b350b10b2480b0b9b41dc1ceca6f75796bdc8 /tests/handlers
parentConvert Transaction and Edu object to attrs (#10542) (diff)
parent 1.40.0rc3 (diff)
downloadsynapse-f8e86b7d2e8670e9688db806ff5a9b97c9ad5365.tar.xz
Merge branch 'release-v1.40' into develop
Diffstat (limited to 'tests/handlers')
-rw-r--r--tests/handlers/test_space_summary.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/handlers/test_space_summary.py b/tests/handlers/test_space_summary.py
index f982a8c8b4..6cc1a02e12 100644
--- a/tests/handlers/test_space_summary.py
+++ b/tests/handlers/test_space_summary.py
@@ -231,13 +231,13 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
         invited_room = self._create_room_with_join_rule(JoinRules.INVITE)
         self.helper.invite(invited_room, targ=user2, tok=self.token)
         restricted_room = self._create_room_with_join_rule(
-            JoinRules.MSC3083_RESTRICTED,
-            room_version=RoomVersions.MSC3083.identifier,
+            JoinRules.RESTRICTED,
+            room_version=RoomVersions.V8.identifier,
             allow=[],
         )
         restricted_accessible_room = self._create_room_with_join_rule(
-            JoinRules.MSC3083_RESTRICTED,
-            room_version=RoomVersions.MSC3083.identifier,
+            JoinRules.RESTRICTED,
+            room_version=RoomVersions.V8.identifier,
             allow=[
                 {
                     "type": RestrictedJoinRuleTypes.ROOM_MEMBERSHIP,
@@ -477,7 +477,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
                     {
                         "room_id": restricted_room,
                         "world_readable": False,
-                        "join_rules": JoinRules.MSC3083_RESTRICTED,
+                        "join_rules": JoinRules.RESTRICTED,
                         "allowed_spaces": [],
                     },
                 ),
@@ -486,7 +486,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
                     {
                         "room_id": restricted_accessible_room,
                         "world_readable": False,
-                        "join_rules": JoinRules.MSC3083_RESTRICTED,
+                        "join_rules": JoinRules.RESTRICTED,
                         "allowed_spaces": [self.room],
                     },
                 ),