paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 15:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Remove unnecessary use of get_realm_by_email_domain.

Browse Source 
That function was primarily intended for some limited registration
code paths, not the generic usage it was getting.
This commit is contained in:
Tim Abbott
2017-08-24 20:20:26 -07:00
parent 1c9521a8d6
commit 80458945c7
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/tests/test_messages.py
View File

@@ -42,7 +42,7 @@ from zerver.lib.soft_deactivation import add_missing_messages, do_soft_deactivat
from zerver.models import ( from zerver.models import (
MAX_MESSAGE_LENGTH, MAX_SUBJECT_LENGTH, MAX_MESSAGE_LENGTH, MAX_SUBJECT_LENGTH,
Message, Realm, Recipient, Stream, UserMessage, UserProfile, Attachment, Message, Realm, Recipient, Stream, UserMessage, UserProfile, Attachment,
RealmAuditLog, RealmDomain, get_realm, get_realm_by_email_domain, RealmAuditLog, RealmDomain, get_realm,
get_stream, get_recipient, get_system_bot, get_user, Reaction, get_stream, get_recipient, get_system_bot, get_user, Reaction,
sew_messages_and_reactions, flush_per_request_caches sew_messages_and_reactions, flush_per_request_caches
) )
@@ -193,7 +193,7 @@ class TestCrossRealmPMs(ZulipTestCase):
def create_user(self, email): def create_user(self, email):
# type: (Text) -> UserProfile # type: (Text) -> UserProfile
self.register(email, 'test') self.register(email, 'test')
return get_user(email, get_realm_by_email_domain(email)) return get_user(email, get_realm(email.split("@")[1]))
@override_settings(CROSS_REALM_BOT_EMAILS=['feedback@zulip.com', @override_settings(CROSS_REALM_BOT_EMAILS=['feedback@zulip.com',
'support@3.example.com']) 'support@3.example.com'])
@@ -218,7 +218,6 @@ class TestCrossRealmPMs(ZulipTestCase):
JsonableError, JsonableError,
'Invalid email ') 'Invalid email ')
random_zulip_email = 'random@zulip.com'
user1_email = 'user1@1.example.com' user1_email = 'user1@1.example.com'
user1a_email = 'user1a@1.example.com' user1a_email = 'user1a@1.example.com'
user2_email = 'user2@2.example.com' user2_email = 'user2@2.example.com'
@@ -226,7 +225,6 @@ class TestCrossRealmPMs(ZulipTestCase):
feedback_email = 'feedback@zulip.com' feedback_email = 'feedback@zulip.com'
support_email = 'support@3.example.com' # note: not zulip.com support_email = 'support@3.example.com' # note: not zulip.com
self.create_user(random_zulip_email)
user1 = self.create_user(user1_email) user1 = self.create_user(user1_email)
user1a = self.create_user(user1a_email) user1a = self.create_user(user1a_email)
user2 = self.create_user(user2_email) user2 = self.create_user(user2_email)
@@ -293,7 +291,7 @@ class TestCrossRealmPMs(ZulipTestCase):
# Users on non-zulip realms can't PM "ordinary" Zulip users # Users on non-zulip realms can't PM "ordinary" Zulip users
with assert_invalid_email(): with assert_invalid_email():
self.send_message(user1_email, random_zulip_email, Recipient.PERSONAL) self.send_message(user1_email, "hamlet@zulip.com", Recipient.PERSONAL)
# Users on three different realms can not PM each other # Users on three different realms can not PM each other
with assert_invalid_email(): with assert_invalid_email():

6
zerver/tests/test_service_bot_system.py
View File

@@ -8,7 +8,7 @@ from typing import Any, Union, Mapping, Callable
from zerver.lib.actions import do_create_user from zerver.lib.actions import do_create_user
from zerver.lib.test_classes import ZulipTestCase from zerver.lib.test_classes import ZulipTestCase
from zerver.models import ( from zerver.models import (
get_realm_by_email_domain, get_realm,
UserProfile, UserProfile,
Recipient, Recipient,
) )
@@ -25,14 +25,14 @@ class TestServiceBotEventTriggers(ZulipTestCase):
self.user_profile = self.example_user("othello") self.user_profile = self.example_user("othello")
self.bot_profile = do_create_user(email="foo-bot@zulip.com", self.bot_profile = do_create_user(email="foo-bot@zulip.com",
password="test", password="test",
realm=get_realm_by_email_domain("zulip.com"), realm=get_realm("zulip"),
full_name="FooBot", full_name="FooBot",
short_name="foo-bot", short_name="foo-bot",
bot_type=UserProfile.OUTGOING_WEBHOOK_BOT, bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,
bot_owner=self.user_profile) bot_owner=self.user_profile)
self.second_bot_profile = do_create_user(email="bar-bot@zulip.com", self.second_bot_profile = do_create_user(email="bar-bot@zulip.com",
password="test", password="test",
realm=get_realm_by_email_domain("zulip.com"), realm=get_realm("zulip"),
full_name="BarBot", full_name="BarBot",
short_name="bar-bot", short_name="bar-bot",
bot_type=UserProfile.OUTGOING_WEBHOOK_BOT, bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,