Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test_narrow: Specify subdomains explicitly.

This commit is contained in:
Tim Abbott 2017-08-25 16:01:12 -07:00
parent edc095db6d
commit 20c0d27317
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
zerver/tests/test_narrow.py
View File

@ -443,11 +443,12 @@ class IncludeHistoryTest(ZulipTestCase):
class GetOldMessagesTest(ZulipTestCase): class GetOldMessagesTest(ZulipTestCase):
def get_and_check_messages(self, modified_params): def get_and_check_messages(self, modified_params, **kwargs):
# type: (Dict[str, Union[str, int]]) -> Dict[str, Dict] # type: (Dict[str, Union[str, int]], **Any) -> Dict[str, Dict]
post_params = {"anchor": 1, "num_before": 1, "num_after": 1} # type: Dict[str, Union[str, int]] post_params = {"anchor": 1, "num_before": 1, "num_after": 1} # type: Dict[str, Union[str, int]]
post_params.update(modified_params) post_params.update(modified_params)
payload = self.client_get("/json/messages", dict(post_params)) payload = self.client_get("/json/messages", dict(post_params),
**kwargs)
self.assert_json_success(payload) self.assert_json_success(payload)
result = ujson.loads(payload.content) result = ujson.loads(payload.content)
@ -619,7 +620,8 @@ class GetOldMessagesTest(ZulipTestCase):
narrow = [dict(operator='stream', operand=u'\u03bb-stream')] narrow = [dict(operator='stream', operand=u'\u03bb-stream')]
result = self.get_and_check_messages(dict(num_after=2, result = self.get_and_check_messages(dict(num_after=2,
narrow=ujson.dumps(narrow))) narrow=ujson.dumps(narrow)),
subdomain="zephyr")
messages = get_user_messages(self.mit_user("starnine")) messages = get_user_messages(self.mit_user("starnine"))
stream_messages = [msg for msg in messages if msg.recipient.type == Recipient.STREAM] stream_messages = [msg for msg in messages if msg.recipient.type == Recipient.STREAM]
@ -656,9 +658,9 @@ class GetOldMessagesTest(ZulipTestCase):
subject=u"\u03bb-topic.d.d.d.d") subject=u"\u03bb-topic.d.d.d.d")
narrow = [dict(operator='topic', operand=u'\u03bb-topic')] narrow = [dict(operator='topic', operand=u'\u03bb-topic')]
result = self.get_and_check_messages(dict( result = self.get_and_check_messages(
num_after=100, dict(num_after=100, narrow=ujson.dumps(narrow)),
narrow=ujson.dumps(narrow))) subdomain="zephyr")
messages = get_user_messages(mit_user_profile) messages = get_user_messages(mit_user_profile)
stream_messages = [msg for msg in messages if msg.recipient.type == Recipient.STREAM] stream_messages = [msg for msg in messages if msg.recipient.type == Recipient.STREAM]
@ -696,10 +698,11 @@ class GetOldMessagesTest(ZulipTestCase):
subject=u".d.d.d.d") subject=u".d.d.d.d")
narrow = [dict(operator='topic', operand=u'personal.d.d')] narrow = [dict(operator='topic', operand=u'personal.d.d')]
result = self.get_and_check_messages(dict( result = self.get_and_check_messages(
num_before=50, dict(num_before=50,
num_after=50, num_after=50,
narrow=ujson.dumps(narrow))) narrow=ujson.dumps(narrow)),
subdomain="zephyr")
messages = get_user_messages(mit_user_profile) messages = get_user_messages(mit_user_profile)
stream_messages = [msg for msg in messages if msg.recipient.type == Recipient.STREAM] stream_messages = [msg for msg in messages if msg.recipient.type == Recipient.STREAM]