diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 15:55:01 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 15:55:01 +0100 |
| commit | 0e7a41dc99952f72d6253cc529bfe4f428447865 (patch) | |
| tree | 0ec5426dda5ee358a7c9915a3bc620e4600bda7f /tests/handlers/test_room.py | |
| parent | Determine and send user presence state (diff) | |
| parent | Fix ALL THE UNIT TESTS (diff) | |
| download | synapse-0e7a41dc99952f72d6253cc529bfe4f428447865.tar.xz | |
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'tests/handlers/test_room.py')
| -rw-r--r-- | tests/handlers/test_room.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py index bf71d3be3b..fddab8f74f 100644 --- a/tests/handlers/test_room.py +++ b/tests/handlers/test_room.py @@ -85,7 +85,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase): event = self.hs.get_event_factory().create_event( etype=RoomMemberEvent.TYPE, user_id=user_id, - target_user_id=target_user_id, + state_key=target_user_id, room_id=room_id, membership=Membership.INVITE, content=content, @@ -133,7 +133,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase): event = self.hs.get_event_factory().create_event( etype=RoomMemberEvent.TYPE, user_id=user_id, - target_user_id=target_user_id, + state_key=target_user_id, room_id=room_id, membership=Membership.JOIN, content=content, @@ -359,7 +359,7 @@ class RoomCreationTest(unittest.TestCase): self.assertEquals(RoomMemberEvent.TYPE, join_event.type) self.assertEquals(room_id, join_event.room_id) self.assertEquals(user_id, join_event.user_id) - self.assertEquals(user_id, join_event.target_user_id) + self.assertEquals(user_id, join_event.state_key) self.assertTrue(self.state_handler.handle_new_event.called) |