From b9bf74d54ec65163f7aa6019c703cc9d992912e5 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Wed, 2 Nov 2016 08:29:41 -0700 Subject: [PATCH] Reorganize sections of test_realm_scenarios(). This change groups the positive scenarios together and likewise for the negative scenarios. --- zerver/tests/test_messages.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py index 0e138d30cb..3a1c748bbb 100644 --- a/zerver/tests/test_messages.py +++ b/zerver/tests/test_messages.py @@ -111,14 +111,6 @@ class TestCrossRealmPMs(ZulipTestCase): self.assertEqual(len(messages), 1) self.assertEquals(messages[0].sender.pk, user1.pk) - """Users on the different realms can not PM each other""" - with assert_disallowed(): - self.send_message(user1_email, user2_email, Recipient.PERSONAL) - - """Users on three different realms can not PM each other""" - with assert_disallowed(): - self.send_message(user1_email, [user2_email, user3_email], Recipient.PERSONAL) - """OG Users in the zulip.com realm can PM any realm""" self.send_message(cross_email, user2_email, Recipient.PERSONAL) @@ -140,6 +132,14 @@ class TestCrossRealmPMs(ZulipTestCase): self.send_message(user1_email, [user2_email, cross_email], Recipient.PERSONAL) + # Users on the different realms can not PM each other + with assert_disallowed(): + self.send_message(user1_email, user2_email, Recipient.PERSONAL) + + # Users on three different realms can not PM each other + with assert_disallowed(): + self.send_message(user1_email, [user2_email, user3_email], Recipient.PERSONAL) + class PersonalMessagesTest(ZulipTestCase): def test_auto_subbed_to_personals(self):