summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-20 11:50:16 +0100
committerErik Johnston <erik@matrix.org>2014-08-20 11:53:57 +0100
commit849627b82e751071f80c96f62c9e59a2565cd85c (patch)
tree903767491ac358cf45f5aebb82cb199edcfc3b48 /tests/rest
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-849627b82e751071f80c96f62c9e59a2565cd85c.tar.xz
Don't generate room membership messages. Include previous state of in membership messages.
Diffstat (limited to 'tests/rest')
-rw-r--r--tests/rest/test_rooms.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/rest/test_rooms.py b/tests/rest/test_rooms.py
index e873181044..a9b66df912 100644
--- a/tests/rest/test_rooms.py
+++ b/tests/rest/test_rooms.py
@@ -794,7 +794,12 @@ class RoomMemberStateTestCase(RestTestCase):
 
         (code, response) = yield self.mock_resource.trigger("GET", path, None)
         self.assertEquals(200, code, msg=str(response))
-        self.assertEquals(json.loads(content), response)
+
+        expected_response = {
+            "membership": Membership.JOIN,
+            "prev": Membership.JOIN,
+        }
+        self.assertEquals(expected_response, response)
 
     @defer.inlineCallbacks
     def test_rooms_members_other(self):