summary refs log tree commit diff
path: root/tests/handlers
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-12-12 11:59:46 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-12-12 11:59:46 +0000
commitb0bb1756a9a85f476c6ebd03a7e78ad5f403311c (patch)
treeb74ea3310015bdeb5dc57fb8ff636fe831fa5bc3 /tests/handlers
parentMerge branch 'develop' into typing_notifications (diff)
downloadsynapse-b0bb1756a9a85f476c6ebd03a7e78ad5f403311c.tar.xz
Send list of typing user IDs as 'user_ids' list within 'content', so that m.typing stream events have a toplevel content, for consistency with others
Diffstat (limited to 'tests/handlers')
-rw-r--r--tests/handlers/test_typing.py20
1 files changed, 15 insertions, 5 deletions
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index bc19db8dfa..391e287adc 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -182,7 +182,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
             [
                 {"type": "m.typing",
                  "room_id": self.room_id,
-                 "typing": [self.u_apple.to_string()]},
+                 "content": {
+                     "user_ids": [self.u_apple.to_string()],
+                 }},
             ]
         )
 
@@ -242,7 +244,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
             [
                 {"type": "m.typing",
                  "room_id": self.room_id,
-                 "typing": [self.u_onion.to_string()]},
+                 "content": {
+                     "user_ids": [self.u_onion.to_string()],
+                }},
             ]
         )
 
@@ -295,7 +299,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
             [
                 {"type": "m.typing",
                  "room_id": self.room_id,
-                 "typing": []},
+                 "content": {
+                     "user_ids": [],
+                }},
             ]
         )
 
@@ -323,7 +329,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
             [
                 {"type": "m.typing",
                  "room_id": self.room_id,
-                 "typing": [self.u_apple.to_string()]},
+                 "content": {
+                     "user_ids": [self.u_apple.to_string()],
+                }},
             ]
         )
 
@@ -339,6 +347,8 @@ class TypingNotificationsTestCase(unittest.TestCase):
             [
                 {"type": "m.typing",
                  "room_id": self.room_id,
-                 "typing": []},
+                 "content": {
+                     "user_ids": [],
+                }},
             ]
         )