summary refs log tree commit diff
path: root/tests/rest/client/v1/test_rooms.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-09-01 12:41:16 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-09-01 12:41:16 +0100
commite255c2c32ff85db03abbf2dac184b2949f481cfb (patch)
tree43e08f2f16d859c14877f9374f0af2f746ffdd8c /tests/rest/client/v1/test_rooms.py
parentTurn TODO into thing which actually will fail (diff)
downloadsynapse-e255c2c32ff85db03abbf2dac184b2949f481cfb.tar.xz
s/user_id/user/g for consistency
Diffstat (limited to 'tests/rest/client/v1/test_rooms.py')
-rw-r--r--tests/rest/client/v1/test_rooms.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py
index be1d52f720..9fb2bfb315 100644
--- a/tests/rest/client/v1/test_rooms.py
+++ b/tests/rest/client/v1/test_rooms.py
@@ -56,7 +56,7 @@ class RoomPermissionsTestCase(RestTestCase):
 
         def _get_user_by_access_token(token=None):
             return {
-                "user_id": UserID.from_string(self.auth_user_id),
+                "user": UserID.from_string(self.auth_user_id),
                 "token_id": 1,
             }
         hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token
@@ -441,7 +441,7 @@ class RoomsMemberListTestCase(RestTestCase):
 
         def _get_user_by_access_token(token=None):
             return {
-                "user_id": UserID.from_string(self.auth_user_id),
+                "user": UserID.from_string(self.auth_user_id),
                 "token_id": 1,
             }
         hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token
@@ -519,7 +519,7 @@ class RoomsCreateTestCase(RestTestCase):
 
         def _get_user_by_access_token(token=None):
             return {
-                "user_id": UserID.from_string(self.auth_user_id),
+                "user": UserID.from_string(self.auth_user_id),
                 "token_id": 1,
             }
         hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token
@@ -610,7 +610,7 @@ class RoomTopicTestCase(RestTestCase):
 
         def _get_user_by_access_token(token=None):
             return {
-                "user_id": UserID.from_string(self.auth_user_id),
+                "user": UserID.from_string(self.auth_user_id),
                 "token_id": 1,
             }
 
@@ -715,7 +715,7 @@ class RoomMemberStateTestCase(RestTestCase):
 
         def _get_user_by_access_token(token=None):
             return {
-                "user_id": UserID.from_string(self.auth_user_id),
+                "user": UserID.from_string(self.auth_user_id),
                 "token_id": 1,
             }
         hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token
@@ -840,7 +840,7 @@ class RoomMessagesTestCase(RestTestCase):
 
         def _get_user_by_access_token(token=None):
             return {
-                "user_id": UserID.from_string(self.auth_user_id),
+                "user": UserID.from_string(self.auth_user_id),
                 "token_id": 1,
             }
         hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token
@@ -935,7 +935,7 @@ class RoomInitialSyncTestCase(RestTestCase):
 
         def _get_user_by_access_token(token=None):
             return {
-                "user_id": UserID.from_string(self.auth_user_id),
+                "user": UserID.from_string(self.auth_user_id),
                 "token_id": 1,
             }
         hs.get_v1auth()._get_user_by_access_token = _get_user_by_access_token