CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-24 21:08:25 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

tests: Introduce send_huddle_message().

Browse Source 
The tighter interface here makes for shorter lines (or
fewer multi-line calls) and it leads to stricter type
checking.
This commit is contained in:
Steve Howell 2017-10-27 10:53:08 -07:00
parent 9707767b21
commit 4b78f69a87
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/lib/test_classes.py
View File

@ -421,6 +421,19 @@ class ZulipTestCase(TestCase):
content
)
def send_huddle_message(self, from_email, to_emails, content=u"test content"):
# type: (Text, List[Text], Text) -> int
sender = get_user_profile_by_email(from_email)
assert(len(to_emails) >= 2)
(sending_client, _) = Client.objects.get_or_create(name="test suite")
return check_send_message(
sender, sending_client, 'private', to_emails, None,
content
)
def send_stream_message(self, sender_email, stream_name,
content=u"test content", topic_name=u"test"):
# type: (Text, Text, Text, Text) -> int

14
zerver/tests/test_messages.py
View File

@ -252,26 +252,22 @@ class TestCrossRealmPMs(ZulipTestCase):
# already individually send PMs to cross-realm bots, we shouldn't
# prevent them from sending multiple bots at once. We may revisit
# this if it's a nuisance for huddles.)
self.send_message(user1_email, [feedback_email, support_email],
Recipient.HUDDLE)
self.send_huddle_message(user1_email, [feedback_email, support_email])
assert_message_received(feedback_bot, user1)
assert_message_received(support_bot, user1)
# Prevent old loophole where I could send PMs to other users as long
# as I copied a cross-realm bot from the same realm.
with assert_invalid_email():
self.send_message(user1_email, [user3_email, support_email],
Recipient.HUDDLE)
self.send_huddle_message(user1_email, [user3_email, support_email])
# Users on three different realms can't PM each other,
# even if one of the users is a cross-realm bot.
with assert_invalid_email():
self.send_message(user1_email, [user2_email, feedback_email],
Recipient.HUDDLE)
self.send_huddle_message(user1_email, [user2_email, feedback_email])
with assert_invalid_email():
self.send_message(feedback_email, [user1_email, user2_email],
Recipient.HUDDLE)
self.send_huddle_message(feedback_email, [user1_email, user2_email])
# Users on the different realms can not PM each other
with assert_invalid_email():
@ -283,7 +279,7 @@ class TestCrossRealmPMs(ZulipTestCase):
# Users on three different realms can not PM each other
with assert_invalid_email():
self.send_message(user1_email, [user2_email, user3_email], Recipient.HUDDLE)
self.send_huddle_message(user1_email, [user2_email, user3_email])
class ExtractedRecipientsTest(TestCase):
def test_extract_recipients(self):