paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 09:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

result.json: Upgrade test_events.

Browse Source
This commit is contained in:
Umair Khan
2017-08-17 11:39:59 +05:00
committed by Tim Abbott
parent de5f43ea47
commit 2b7bb6e965
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/tests/test_events.py
View File

@@ -148,7 +148,7 @@ class EventsEndpointTest(ZulipTestCase):
result = self.client_post('/json/register', dict(event_types=ujson.dumps(['pointer'])), result = self.client_post('/json/register', dict(event_types=ujson.dumps(['pointer'])),
**self.api_auth(email)) **self.api_auth(email))
self.assert_json_success(result) self.assert_json_success(result)
result_dict = ujson.loads(result.content) result_dict = result.json()
self.assertEqual(result_dict['last_event_id'], -1) self.assertEqual(result_dict['last_event_id'], -1)
self.assertEqual(result_dict['queue_id'], '15:11') self.assertEqual(result_dict['queue_id'], '15:11')
@@ -165,7 +165,7 @@ class EventsEndpointTest(ZulipTestCase):
**self.api_auth(email)) **self.api_auth(email))
self.assert_json_success(result) self.assert_json_success(result)
result_dict = ujson.loads(result.content) result_dict = result.json()
self.assertEqual(result_dict['last_event_id'], 6) self.assertEqual(result_dict['last_event_id'], 6)
self.assertEqual(result_dict['pointer'], 15) self.assertEqual(result_dict['pointer'], 15)
self.assertEqual(result_dict['queue_id'], '15:12') self.assertEqual(result_dict['queue_id'], '15:12')
@@ -178,7 +178,7 @@ class EventsEndpointTest(ZulipTestCase):
fetch_event_types=ujson.dumps(['message'])), fetch_event_types=ujson.dumps(['message'])),
**self.api_auth(email)) **self.api_auth(email))
self.assert_json_success(result) self.assert_json_success(result)
result_dict = ujson.loads(result.content) result_dict = result.json()
self.assertEqual(result_dict['last_event_id'], 6) self.assertEqual(result_dict['last_event_id'], 6)
# Check that the message event types data is in there # Check that the message event types data is in there
self.assertIn('max_message_id', result_dict) self.assertIn('max_message_id', result_dict)
@@ -193,7 +193,7 @@ class EventsEndpointTest(ZulipTestCase):
event_types=ujson.dumps(['message'])), event_types=ujson.dumps(['message'])),
**self.api_auth(email)) **self.api_auth(email))
self.assert_json_success(result) self.assert_json_success(result)
result_dict = ujson.loads(result.content) result_dict = result.json()
self.assertEqual(result_dict['last_event_id'], 6) self.assertEqual(result_dict['last_event_id'], 6)
# Check that we didn't fetch the messages data # Check that we didn't fetch the messages data
self.assertNotIn('max_message_id', result_dict) self.assertNotIn('max_message_id', result_dict)