paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_hooks: Use send_json_payload for private message tests.

Browse Source
This commit is contained in:
Tim Abbott
2016-06-30 15:11:02 -07:00
parent a78c1b9750
commit 0397855fdd
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/test_helpers.py
View File

@@ -423,7 +423,9 @@ class AuthedTestCase(TestCase):
# Check the correct message was sent
msg = self.get_last_message()
self.assertEqual(msg.sender.email, email)
self.assertEqual(get_display_recipient(msg.recipient), stream_name)
if stream_name is not None:
self.assertEqual(get_display_recipient(msg.recipient), stream_name)
# TODO: should also validate recipient for private messages
return msg

8
zerver/tests/test_hooks.py
View File

@@ -45,12 +45,12 @@ class WebhookTestCase(AuthedTestCase):
if content_type is not None:
kwargs['content_type'] = content_type
result = self.client.post(self.url, payload, content_type=content_type)
self.assert_json_success(result)
msg = self.get_last_message()
msg = self.send_json_payload(self.TEST_USER_EMAIL, self.url, payload,
stream_name=None, **kwargs)
self.do_test_message(msg, expected_message)
return msg
def build_webhook_url(self):
# type: () -> text_type
api_key = self.get_api_key(self.TEST_USER_EMAIL)