diff --git a/zerver/tests/test_auth_backends.py b/zerver/tests/test_auth_backends.py index 215062237e..e4cba4cfc0 100644 --- a/zerver/tests/test_auth_backends.py +++ b/zerver/tests/test_auth_backends.py @@ -21,7 +21,7 @@ from zerver.lib.test_classes import ( ZulipTestCase, ) from zerver.models import \ - get_realm, get_user_profile_by_email, email_to_username, UserProfile, \ + get_realm_by_string_id, get_user_profile_by_email, email_to_username, UserProfile, \ PreregistrationUser, Realm from confirmation.models import Confirmation @@ -1331,7 +1331,7 @@ class TestLDAP(ZulipTestCase): with self.settings(AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map): backend = self.backend email = 'nonexisting@zulip.com' - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') do_deactivate_realm(realm) with self.assertRaisesRegexp(Exception, 'Realm has been deactivated'): backend.get_or_create_user(email, _LDAPUser()) @@ -1500,7 +1500,7 @@ class TestAdminSetBackends(ZulipTestCase): result = self.client_patch("/json/realm", { 'authentication_methods': ujson.dumps({u'Email': False, u'Dev': True})}) self.assert_json_success(result) - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') self.assertFalse(password_auth_enabled(realm)) self.assertTrue(dev_auth_enabled(realm)) @@ -1511,7 +1511,7 @@ class TestAdminSetBackends(ZulipTestCase): result = self.client_patch("/json/realm", { 'authentication_methods' : ujson.dumps({u'Email': False, u'Dev': False})}) self.assert_json_error(result, 'At least one authentication method must be enabled.', status_code=403) - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') self.assertTrue(password_auth_enabled(realm)) self.assertTrue(dev_auth_enabled(realm)) @@ -1523,7 +1523,7 @@ class TestAdminSetBackends(ZulipTestCase): result = self.client_patch("/json/realm", { 'authentication_methods' : ujson.dumps({u'Email': False, u'Dev': True, u'GitHub': False})}) self.assert_json_success(result) - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') # Check that unsupported backend is not enabled self.assertFalse(github_auth_enabled(realm)) self.assertTrue(dev_auth_enabled(realm)) diff --git a/zerver/tests/test_bugdown.py b/zerver/tests/test_bugdown.py index efa556001f..df814f6957 100644 --- a/zerver/tests/test_bugdown.py +++ b/zerver/tests/test_bugdown.py @@ -9,7 +9,7 @@ from zerver.lib.actions import ( check_add_realm_emoji, do_remove_realm_emoji, do_set_alert_words, - get_realm, + get_realm_by_string_id, ) from zerver.lib.alert_words import alert_words_in_realm from zerver.lib.camo import get_camo_url @@ -412,7 +412,7 @@ class BugdownTest(TestCase): # type: (text_type, text_type) -> text_type return '%s' % (name, get_camo_url(url), name) - zulip_realm = get_realm('zulip.com') + zulip_realm = get_realm_by_string_id('zulip') url = "https://zulip.com/test_realm_emoji.png" check_add_realm_emoji(zulip_realm, "test", url) @@ -437,7 +437,7 @@ class BugdownTest(TestCase): def test_realm_patterns(self): # type: () -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') url_format_string = r"https://trac.zulip.net/ticket/%(id)s" realm_filter = RealmFilter(realm=realm, pattern=r"#(?P[0-9]{2,8})", @@ -463,7 +463,7 @@ class BugdownTest(TestCase): def test_maybe_update_realm_filters(self): # type: () -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') url_format_string = r"https://trac.zulip.net/ticket/%(id)s" realm_filter = RealmFilter(realm=realm, pattern=r"#(?P[0-9]{2,8})", @@ -480,8 +480,7 @@ class BugdownTest(TestCase): def test_flush_realm_filter(self): # type: () -> None - domain = 'zulip.com' - realm = get_realm(domain) + realm = get_realm_by_string_id('zulip') def flush(): # type: () -> None @@ -504,24 +503,24 @@ class BugdownTest(TestCase): # start fresh for our domain flush() - self.assertFalse(domain_in_local_realm_filters_cache(domain)) + self.assertFalse(domain_in_local_realm_filters_cache(domain=realm.domain)) # call this just for side effects of populating the cache - realm_filters_for_domain(domain=domain) - self.assertTrue(domain_in_local_realm_filters_cache(domain)) + realm_filters_for_domain(domain=realm.domain) + self.assertTrue(domain_in_local_realm_filters_cache(realm.domain)) # Saving a new RealmFilter should have the side effect of # flushing the cache. save_new_realm_filter() - self.assertFalse(domain_in_local_realm_filters_cache(domain)) + self.assertFalse(domain_in_local_realm_filters_cache(realm.domain)) # and flush it one more time, to make sure we don't get a KeyError flush() - self.assertFalse(domain_in_local_realm_filters_cache(domain)) + self.assertFalse(domain_in_local_realm_filters_cache(realm.domain)) def test_realm_patterns_negative(self): # type: () -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') RealmFilter(realm=realm, pattern=r"#(?P[0-9]{2,8})", url_format_string=r"https://trac.zulip.net/ticket/%(id)s").save() boring_msg = Message(sender=get_user_profile_by_email("othello@zulip.com"), @@ -644,7 +643,7 @@ class BugdownTest(TestCase): def test_stream_single(self): # type: () -> None - denmark = get_stream('Denmark', get_realm('zulip.com')) + denmark = get_stream('Denmark', get_realm_by_string_id('zulip')) sender_user_profile = get_user_profile_by_email("othello@zulip.com") msg = Message(sender=sender_user_profile, sending_client=get_client("test")) content = "#**Denmark**" @@ -658,7 +657,7 @@ class BugdownTest(TestCase): # type: () -> None sender_user_profile = get_user_profile_by_email("othello@zulip.com") msg = Message(sender=sender_user_profile, sending_client=get_client("test")) - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') denmark = get_stream('Denmark', realm) scotland = get_stream('Scotland', realm) content = "Look to #**Denmark** and #**Scotland**, there something" @@ -674,7 +673,7 @@ class BugdownTest(TestCase): def test_stream_case_sensitivity(self): # type: () -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') case_sens = Stream.objects.create(name='CaseSens', realm=realm) sender_user_profile = get_user_profile_by_email("othello@zulip.com") msg = Message(sender=sender_user_profile, sending_client=get_client("test")) @@ -690,7 +689,7 @@ class BugdownTest(TestCase): """#StreamName requires the stream be spelled with the correct case currently. If we change that in the future, we'll need to change this test.""" - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') Stream.objects.create(name='CaseSens', realm=realm) sender_user_profile = get_user_profile_by_email("othello@zulip.com") msg = Message(sender=sender_user_profile, sending_client=get_client("test")) @@ -701,7 +700,7 @@ class BugdownTest(TestCase): def test_stream_unicode(self): # type: () -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') uni = Stream.objects.create(name=u'привет', realm=realm) sender_user_profile = get_user_profile_by_email("othello@zulip.com") msg = Message(sender=sender_user_profile, sending_client=get_client("test")) diff --git a/zerver/tests/test_decorators.py b/zerver/tests/test_decorators.py index 6dce87916b..cdf125ba2e 100644 --- a/zerver/tests/test_decorators.py +++ b/zerver/tests/test_decorators.py @@ -31,7 +31,7 @@ from zerver.lib.validator import ( check_string, check_dict, check_bool, check_int, check_list ) from zerver.models import \ - get_realm, get_user_profile_by_email + get_realm_by_string_id, get_user_profile_by_email import ujson @@ -443,8 +443,8 @@ class DeactivatedRealmTest(ZulipTestCase): rest_dispatch rejects requests in a deactivated realm, both /json and api """ - realm = get_realm("zulip.com") - do_deactivate_realm(get_realm("zulip.com")) + realm = get_realm_by_string_id("zulip") + do_deactivate_realm(get_realm_by_string_id("zulip")) result = self.client_post("/json/messages", {"type": "private", "content": "Test message", @@ -477,7 +477,7 @@ class DeactivatedRealmTest(ZulipTestCase): authenticated_json_view views fail in a deactivated realm """ - realm = get_realm("zulip.com") + realm = get_realm_by_string_id("zulip") email = "hamlet@zulip.com" test_password = "abcd1234" user_profile = get_user_profile_by_email(email) @@ -494,7 +494,7 @@ class DeactivatedRealmTest(ZulipTestCase): logging in fails in a deactivated realm """ - do_deactivate_realm(get_realm("zulip.com")) + do_deactivate_realm(get_realm_by_string_id("zulip")) result = self.login_with_return("hamlet@zulip.com") self.assert_in_response("has been deactivated", result) @@ -503,7 +503,7 @@ class DeactivatedRealmTest(ZulipTestCase): Using a webhook while in a deactivated realm fails """ - do_deactivate_realm(get_realm("zulip.com")) + do_deactivate_realm(get_realm_by_string_id("zulip")) email = "hamlet@zulip.com" api_key = self.get_api_key(email) url = "/api/v1/external/jira?api_key=%s&stream=jira_custom" % (api_key,) diff --git a/zerver/tests/test_email_mirror.py b/zerver/tests/test_email_mirror.py index 28fb2f2797..c7b461fce8 100644 --- a/zerver/tests/test_email_mirror.py +++ b/zerver/tests/test_email_mirror.py @@ -14,7 +14,7 @@ from zerver.lib.test_classes import ( from zerver.models import ( get_display_recipient, get_stream, get_user_profile_by_email, - Recipient, get_realm, + Recipient, get_realm_by_string_id, ) from zerver.lib.actions import ( @@ -358,7 +358,7 @@ class TestCommandMTA(TestCase): # type: (mock.Mock) -> None sender = "hamlet@zulip.com" - stream = get_stream("Denmark", get_realm("zulip.com")) + stream = get_stream("Denmark", get_realm_by_string_id("zulip")) stream_to_address = encode_email_address(stream) template_path = os.path.join(MAILS_DIR, "simple.txt") diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index 4311b01e96..8bffe9ce5b 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -6,7 +6,7 @@ from django.http import HttpRequest, HttpResponse from django.test import TestCase from zerver.models import ( - get_client, get_realm, get_stream, get_user_profile_by_email, + get_client, get_realm_by_string_id, get_stream, get_user_profile_by_email, Message, Recipient, UserProfile ) @@ -216,7 +216,7 @@ class EventsRegisterTest(ZulipTestCase): def create_bot(self, email): # type: (str) -> UserProfile return do_create_user(email, '123', - get_realm('zulip.com'), 'Test Bot', 'test', + get_realm_by_string_id('zulip'), 'Test Bot', 'test', bot_type=UserProfile.DEFAULT_BOT, bot_owner=self.user_profile) def realm_bot_schema(self, field_name, check): @@ -619,12 +619,12 @@ class EventsRegisterTest(ZulipTestCase): ('op', equals('update')), ('realm_emoji', check_dict([])), ]) - events = self.do_test(lambda: check_add_realm_emoji(get_realm("zulip.com"), "my_emoji", + events = self.do_test(lambda: check_add_realm_emoji(get_realm_by_string_id("zulip"), "my_emoji", "https://realm.com/my_emoji")) error = schema_checker('events[0]', events[0]) self.assert_on_error(error) - events = self.do_test(lambda: do_remove_realm_emoji(get_realm("zulip.com"), "my_emoji")) + events = self.do_test(lambda: do_remove_realm_emoji(get_realm_by_string_id("zulip"), "my_emoji")) error = schema_checker('events[0]', events[0]) self.assert_on_error(error) @@ -634,12 +634,12 @@ class EventsRegisterTest(ZulipTestCase): ('type', equals('realm_filters')), ('realm_filters', check_list(None)), # TODO: validate tuples in the list ]) - events = self.do_test(lambda: do_add_realm_filter(get_realm("zulip.com"), "#[123]", + events = self.do_test(lambda: do_add_realm_filter(get_realm_by_string_id("zulip"), "#[123]", "https://realm.com/my_realm_filter/%(id)s")) error = schema_checker('events[0]', events[0]) self.assert_on_error(error) - self.do_test(lambda: do_remove_realm_filter(get_realm("zulip.com"), "#[123]")) + self.do_test(lambda: do_remove_realm_filter(get_realm_by_string_id("zulip"), "#[123]")) error = schema_checker('events[0]', events[0]) self.assert_on_error(error) @@ -727,7 +727,7 @@ class EventsRegisterTest(ZulipTestCase): def test_rename_stream(self): # type: () -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') stream = self.make_stream('old_name') new_name = u'stream with a brand new name' self.subscribe_to_stream(self.user_profile.email, stream.name) @@ -865,7 +865,7 @@ class EventsRegisterTest(ZulipTestCase): error = add_schema_checker('events[1]', events[1]) self.assert_on_error(error) - action = lambda: do_change_stream_description(get_realm('zulip.com'), 'test_stream', u'new description') + action = lambda: do_change_stream_description(get_realm_by_string_id('zulip'), 'test_stream', u'new description') events = self.do_test(action) error = stream_update_schema_checker('events[0]', events[0]) self.assert_on_error(error) diff --git a/zerver/tests/test_management_commands.py b/zerver/tests/test_management_commands.py index 930647a82b..a31ac63a56 100644 --- a/zerver/tests/test_management_commands.py +++ b/zerver/tests/test_management_commands.py @@ -4,7 +4,7 @@ from mock import patch, MagicMock from django.test import TestCase from django.conf import settings from django.core.management import call_command -from zerver.models import get_realm +from zerver.models import get_realm_by_string_id from confirmation.models import RealmCreationKey, generate_realm_creation_url from datetime import timedelta from zerver.lib.test_classes import ZulipTestCase @@ -70,8 +70,6 @@ class TestGenerateRealmCreationLink(ZulipTestCase): def test_generate_link_and_create_realm(self): # type: () -> None - username = "user1" - domain = "test.com" email = "user1@test.com" generated_link = generate_realm_creation_url() @@ -82,11 +80,11 @@ class TestGenerateRealmCreationLink(ZulipTestCase): self.assert_in_response(u"Let's get started…", result) # Create Realm with generated link - self.assertIsNone(get_realm(domain)) + self.assertIsNone(get_realm_by_string_id('test')) result = self.client_post(generated_link, {'email': email}) self.assertEquals(result.status_code, 302) self.assertTrue(result["Location"].endswith( - "/accounts/send_confirm/%s@%s" % (username, domain))) + "/accounts/send_confirm/%s" % (email,))) result = self.client_get(result["Location"]) self.assert_in_response("Check your email so we can get started.", result) diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py index 52ade9f117..ecc6132e43 100644 --- a/zerver/tests/test_messages.py +++ b/zerver/tests/test_messages.py @@ -31,7 +31,7 @@ from zerver.lib.test_classes import ( from zerver.models import ( MAX_MESSAGE_LENGTH, MAX_SUBJECT_LENGTH, Message, Realm, Recipient, Stream, UserMessage, UserProfile, Attachment, RealmAlias, - get_realm, get_stream, get_user_profile_by_email, + get_realm_by_string_id, get_stream, get_user_profile_by_email, ) from zerver.lib.actions import ( @@ -127,7 +127,7 @@ class TopicHistoryTest(ZulipTestCase): # out of realm bad_stream = self.make_stream( 'mit_stream', - realm=get_realm('mit.edu') + realm=get_realm_by_string_id('mit') ) endpoint = '/json/users/me/%s/topics' % (bad_stream.id,) result = self.client_get(endpoint, dict()) @@ -158,7 +158,7 @@ class TestCrossRealmPMs(ZulipTestCase): # We need to save the object before we can access # the many-to-many relationship 'realms' dep.save() - dep.realms = [get_realm("zulip.com")] + dep.realms = [get_realm_by_string_id("zulip")] dep.save() @@ -508,7 +508,7 @@ class StreamMessagesTest(ZulipTestCase): # Subscribe everyone to a stream with non-ASCII characters. non_ascii_stream_name = u"hümbüǵ" - realm = get_realm("zulip.com") + realm = get_realm_by_string_id("zulip") stream = self.make_stream(non_ascii_stream_name) for user_profile in UserProfile.objects.filter(realm=realm): self.subscribe_to_stream(user_profile.email, stream.name) diff --git a/zerver/tests/test_narrow.py b/zerver/tests/test_narrow.py index 834df0da33..286a5155dc 100644 --- a/zerver/tests/test_narrow.py +++ b/zerver/tests/test_narrow.py @@ -10,7 +10,7 @@ from sqlalchemy.sql import ( from zerver.models import ( Realm, Recipient, Stream, Subscription, UserProfile, Attachment, - get_display_recipient, get_recipient, get_realm, get_stream, get_user_profile_by_email, + get_display_recipient, get_recipient, get_realm_by_string_id, get_stream, get_user_profile_by_email, ) from zerver.lib.message import ( MessageDict, @@ -61,7 +61,7 @@ def mute_stream(realm, user_profile, stream_name): class NarrowBuilderTest(ZulipTestCase): def setUp(self): - self.realm = get_realm('zulip.com') + self.realm = get_realm_by_string_id('zulip') self.user_profile = get_user_profile_by_email("hamlet@zulip.com") self.builder = NarrowBuilder(self.user_profile, column('id')) self.raw_query = select([column("id")], None, "zerver_message") @@ -277,7 +277,7 @@ class BuildNarrowFilterTest(TestCase): class IncludeHistoryTest(ZulipTestCase): def test_ok_to_include_history(self): - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') self.make_stream('public_stream', realm=realm) # Negated stream searches should not include history. @@ -896,7 +896,7 @@ class GetOldMessagesTest(ZulipTestCase): doing. """ - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') self.make_stream('web stuff') user_profile = get_user_profile_by_email("hamlet@zulip.com") user_profile.muted_topics = ujson.dumps([['Scotland', 'golf'], ['web stuff', 'css'], ['bogus', 'bogus']]) @@ -931,7 +931,7 @@ class GetOldMessagesTest(ZulipTestCase): self.assertIn('AND message_id = 10000000000000000', queries[0]['sql']) def test_exclude_muting_conditions(self): - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') self.make_stream('web stuff') user_profile = get_user_profile_by_email("hamlet@zulip.com") diff --git a/zerver/tests/test_realm_emoji.py b/zerver/tests/test_realm_emoji.py index a913c6ed25..5891f11510 100644 --- a/zerver/tests/test_realm_emoji.py +++ b/zerver/tests/test_realm_emoji.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import -from zerver.lib.actions import get_realm, check_add_realm_emoji +from zerver.lib.actions import get_realm_by_string_id, check_add_realm_emoji from zerver.lib.test_classes import ZulipTestCase from zerver.models import RealmEmoji import ujson @@ -11,7 +11,7 @@ class RealmEmojiTest(ZulipTestCase): def test_list(self): # type: () -> None self.login("iago@zulip.com") - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') check_add_realm_emoji(realm, "my_emoji", "https://example.com/my_emoji") result = self.client_get("/json/realm/emoji") self.assert_json_success(result) @@ -32,7 +32,7 @@ class RealmEmojiTest(ZulipTestCase): self.assert_json_success(result) self.assertEqual(len(content["emoji"]), 1) - realm_emoji = RealmEmoji.objects.get(realm=get_realm('zulip.com')) + realm_emoji = RealmEmoji.objects.get(realm=get_realm_by_string_id('zulip')) self.assertEqual( str(realm_emoji), '' @@ -48,7 +48,7 @@ class RealmEmojiTest(ZulipTestCase): def test_delete(self): # type: () -> None self.login("iago@zulip.com") - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') check_add_realm_emoji(realm, "my_emoji", "https://example.com/my_emoji") result = self.client_delete("/json/realm/emoji/my_emoji") self.assert_json_success(result) diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index e16e8b0fea..70ba59f2d2 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -12,7 +12,7 @@ from zilencer.models import Deployment from zerver.views import do_change_password, create_homepage_form from zerver.views.invite import get_invitee_emails_set from zerver.models import ( - get_realm, get_realm_by_string_id, get_prereg_user_by_email, get_user_profile_by_email, + get_realm_by_string_id, get_prereg_user_by_email, get_user_profile_by_email, PreregistrationUser, Realm, RealmAlias, Recipient, ScheduledJob, UserProfile, UserMessage, Stream, Subscription, ) @@ -230,7 +230,7 @@ class LoginTest(ZulipTestCase): def test_register(self): # type: () -> None - realm = get_realm("zulip.com") + realm = get_realm_by_string_id("zulip") stream_names = ["stream_%s" % i for i in range(40)] for stream_name in stream_names: self.make_stream(stream_name, realm=realm) @@ -250,7 +250,7 @@ class LoginTest(ZulipTestCase): If you try to register for a deactivated realm, you get a clear error page. """ - realm = get_realm("zulip.com") + realm = get_realm_by_string_id("zulip") realm.deactivated = True realm.save(update_fields=["deactivated"]) @@ -265,7 +265,7 @@ class LoginTest(ZulipTestCase): """ If you try to log in to a deactivated realm, you get a clear error page. """ - realm = get_realm("zulip.com") + realm = get_realm_by_string_id("zulip") realm.deactivated = True realm.save(update_fields=["deactivated"]) @@ -497,7 +497,7 @@ so we didn't send them an invitation. We did send invitations to everyone else!" In a realm with `restricted_to_domain = True`, you can't invite people with a different domain from that of the realm or your e-mail address. """ - zulip_realm = get_realm("zulip.com") + zulip_realm = get_realm_by_string_id("zulip") zulip_realm.restricted_to_domain = True zulip_realm.save() @@ -514,7 +514,7 @@ so we didn't send them an invitation. We did send invitations to everyone else!" In a realm with `restricted_to_domain = False`, you can invite people with a different domain from that of the realm or your e-mail address. """ - zulip_realm = get_realm("zulip.com") + zulip_realm = get_realm_by_string_id("zulip") zulip_realm.restricted_to_domain = False zulip_realm.save() @@ -652,18 +652,19 @@ class RealmCreationTest(ZulipTestCase): username = "user1" password = "test" string_id = "zuliptest" - domain = "test.com" + domain = 'test.com' email = "user1@test.com" + realm = get_realm_by_string_id('test') # Make sure the realm does not exist - self.assertIsNone(get_realm(domain)) + self.assertIsNone(realm) with self.settings(OPEN_REALM_CREATION=True): # Create new realm with the email result = self.client_post('/create_realm/', {'email': email}) self.assertEquals(result.status_code, 302) self.assertTrue(result["Location"].endswith( - "/accounts/send_confirm/%s@%s" % (username, domain))) + "/accounts/send_confirm/%s" % (email,))) result = self.client_get(result["Location"]) self.assert_in_response("Check your email so we can get started.", result) @@ -699,14 +700,14 @@ class RealmCreationTest(ZulipTestCase): realm_name = "Test" # Make sure the realm does not exist - self.assertIsNone(get_realm(domain)) + self.assertIsNone(get_realm_by_string_id('test')) with self.settings(REALMS_HAVE_SUBDOMAINS=True), self.settings(OPEN_REALM_CREATION=True): # Create new realm with the email result = self.client_post('/create_realm/', {'email': email}) self.assertEquals(result.status_code, 302) self.assertTrue(result["Location"].endswith( - "/accounts/send_confirm/%s@%s" % (username, domain))) + "/accounts/send_confirm/%s" % (email,))) result = self.client_get(result["Location"]) self.assert_in_response("Check your email so we can get started.", result) @@ -782,9 +783,9 @@ class UserSignUpTest(ZulipTestCase): """ username = "newguy" email = "newguy@zulip.com" - domain = "zulip.com" password = "newpassword" - realm = get_realm(domain) + realm = get_realm_by_string_id('zulip') + domain = realm.domain do_set_realm_default_language(realm, "de") result = self.client_post('/accounts/home/', {'email': email}) @@ -812,17 +813,16 @@ class UserSignUpTest(ZulipTestCase): # type: () -> None username = "user1" password = "test" - domain = "zulip.com" email = "user1@acme.com" subdomain = "zulip" realm_name = "Zulip" - realm = get_realm(domain) + realm = get_realm_by_string_id('zulip') realm.restricted_to_domain = False realm.invite_required = False realm.save() - realm = get_realm("mit.edu") + realm = get_realm_by_string_id('mit') do_deactivate_realm(realm) realm.save() @@ -861,12 +861,11 @@ class UserSignUpTest(ZulipTestCase): # type: () -> None username = "user1" password = "test" - domain = "zulip.com" email = "user1@acme.com" subdomain = "zulip" realm_name = "Zulip" - realm = get_realm(domain) + realm = get_realm_by_string_id('zulip') realm.restricted_to_domain = False realm.invite_required = False realm.save() @@ -904,7 +903,7 @@ class UserSignUpTest(ZulipTestCase): def test_failed_signup_due_to_restricted_domain(self): # type: () -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') with self.settings(REALMS_HAVE_SUBDOMAINS = True): request = HostRequestMock(host = realm.host) request.session = {} # type: ignore @@ -913,7 +912,7 @@ class UserSignUpTest(ZulipTestCase): def test_failed_signup_due_to_invite_required(self): # type: () -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') realm.invite_required = True realm.save() request = HostRequestMock(host = realm.host) diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py index 689cd3874d..3e897159ee 100644 --- a/zerver/tests/test_subs.py +++ b/zerver/tests/test_subs.py @@ -38,7 +38,7 @@ from zerver.lib.actions import ( do_add_default_stream, do_change_is_admin, do_create_realm, do_remove_default_stream, do_set_realm_create_stream_by_admins_only, gather_subscriptions_helper, bulk_add_subscriptions, bulk_remove_subscriptions, - gather_subscriptions, get_default_streams_for_realm, get_realm, get_stream, + gather_subscriptions, get_default_streams_for_realm, get_realm_by_string_id, get_stream, get_user_profile_by_email, set_default_streams, get_subscription, create_streams_if_needed, active_user_ids ) @@ -59,7 +59,7 @@ class TestCreateStreams(ZulipTestCase): def test_creating_streams(self): # type: () -> None stream_names = [u'new1', u'new2', u'new3'] - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') new_streams, existing_streams = create_streams_if_needed( realm, @@ -84,7 +84,7 @@ class TestCreateStreams(ZulipTestCase): class RecipientTest(ZulipTestCase): def test_recipient(self): # type: () -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') stream = get_stream('Verona', realm) recipient = Recipient.objects.get( type_id=stream.id, @@ -393,7 +393,7 @@ class StreamAdminTest(ZulipTestCase): self.assertEqual(deletion_events, []) with self.assertRaises(Stream.DoesNotExist): - Stream.objects.get(realm=get_realm("zulip.com"), name=active_name) + Stream.objects.get(realm=get_realm_by_string_id("zulip"), name=active_name) # A deleted stream's name is changed, is deactivated, is invite-only, # and has no subscribers. @@ -624,7 +624,7 @@ class DefaultStreamTest(ZulipTestCase): def test_add_and_remove_default_stream(self): # type: () -> None - realm = get_realm("zulip.com") + realm = get_realm_by_string_id("zulip") orig_stream_names = self.get_default_stream_names(realm) do_add_default_stream(realm, 'Added Stream') new_stream_names = self.get_default_stream_names(realm) @@ -1353,7 +1353,7 @@ class SubscriptionAPITest(ZulipTestCase): # type: () -> None email1 = 'cordelia@zulip.com' email2 = 'iago@zulip.com' - realm = get_realm("zulip.com") + realm = get_realm_by_string_id("zulip") streams_to_sub = ['multi_user_stream'] events = [] # type: List[Dict[str, Any]] with tornado_redirected_to_list(events): @@ -1551,7 +1551,7 @@ class SubscriptionAPITest(ZulipTestCase): def test_bulk_subscribe_MIT(self): # type: () -> None - realm = get_realm("mit.edu") + realm = get_realm_by_string_id("mit") streams = ["stream_%s" % i for i in range(40)] for stream_name in streams: self.make_stream(stream_name, realm=realm) @@ -2057,7 +2057,7 @@ class GetSubscribersTest(ZulipTestCase): """ Check never_subscribed streams are fetched correctly and not include invite_only streams. """ - realm = get_realm("zulip.com") + realm = get_realm_by_string_id("zulip") streams = ["stream_%s" % i for i in range(10)] for stream_name in streams: self.make_stream(stream_name, realm=realm) diff --git a/zerver/tests/tests.py b/zerver/tests/tests.py index 67b5c4cd5c..693c5becc5 100644 --- a/zerver/tests/tests.py +++ b/zerver/tests/tests.py @@ -21,7 +21,7 @@ from zerver.forms import WRONG_SUBDOMAIN_ERROR from zerver.models import UserProfile, Recipient, \ Realm, RealmAlias, UserActivity, \ - get_user_profile_by_email, get_realm, get_realm_by_email_domain, \ + get_user_profile_by_email, get_realm_by_string_id, get_realm_by_email_domain, \ get_client, get_stream, Message, get_unique_open_realm, \ completely_open, GetRealmByDomainException @@ -115,15 +115,15 @@ class RealmTest(ZulipTestCase): cache, and we start by populating the cache for Hamlet, and we end by checking the cache to ensure that the new value is there.""" get_user_profile_by_email('hamlet@zulip.com') - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') new_name = 'Zed You Elle Eye Pea' do_set_realm_name(realm, new_name) - self.assertEqual(get_realm(realm.domain).name, new_name) + self.assertEqual(get_realm_by_string_id(realm.string_id).name, new_name) self.assert_user_profile_cache_gets_new_name('hamlet@zulip.com', new_name) def test_do_set_realm_name_events(self): # type: () -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') new_name = 'Puliz' events = [] # type: List[Dict[str, Any]] with tornado_redirected_to_list(events): @@ -147,7 +147,7 @@ class RealmTest(ZulipTestCase): def set_up_db(attr, value): # type: (str, Any) -> None - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') setattr(realm, attr, value) realm.save() @@ -156,7 +156,7 @@ class RealmTest(ZulipTestCase): params = {k: ujson.dumps(v) for k, v in kwarg.items()} result = self.client_patch('/json/realm', params) self.assert_json_success(result) - return get_realm('zulip.com') # refresh data + return get_realm_by_string_id('zulip') # refresh data # name realm = update_with_api(name=new_name) @@ -225,7 +225,7 @@ class RealmTest(ZulipTestCase): realm appears to be deactivated. You can make this test fail by disabling cache.flush_realm().""" get_user_profile_by_email('hamlet@zulip.com') - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') do_deactivate_realm(realm) user = get_user_profile_by_email('hamlet@zulip.com') self.assertTrue(user.realm.deactivated) @@ -233,7 +233,7 @@ class RealmTest(ZulipTestCase): def test_do_set_realm_default_language(self): # type: () -> None new_lang = "de" - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') self.assertNotEqual(realm.default_language, new_lang) # we need an admin user. email = 'iago@zulip.com' @@ -242,7 +242,7 @@ class RealmTest(ZulipTestCase): req = dict(default_language=ujson.dumps(new_lang)) result = self.client_patch('/json/realm', req) self.assert_json_success(result) - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') self.assertEqual(realm.default_language, new_lang) # Test setting zh_CN, we set zh_HANS instead of zh_CN in db @@ -251,7 +251,7 @@ class RealmTest(ZulipTestCase): req = dict(default_language=ujson.dumps(chinese)) result = self.client_patch('/json/realm', req) self.assert_json_success(result) - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') self.assertEqual(realm.default_language, simplified_chinese) # Test to make sure that when invalid languages are passed @@ -261,7 +261,7 @@ class RealmTest(ZulipTestCase): req = dict(default_language=ujson.dumps(invalid_lang)) result = self.client_patch('/json/realm', req) self.assert_json_error(result, "Invalid language '%s'" % (invalid_lang,)) - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') self.assertNotEqual(realm.default_language, invalid_lang) @@ -490,7 +490,7 @@ class AdminCreateUserTest(ZulipTestCase): self.assert_json_error(result, "Email 'romeo@not-zulip.com' does not belong to domain 'zulip.com'") - RealmAlias.objects.create(realm=get_realm('zulip.com'), domain='zulip.net') + RealmAlias.objects.create(realm=get_realm_by_string_id('zulip'), domain='zulip.net') # HAPPY PATH STARTS HERE valid_params = dict( @@ -1979,7 +1979,7 @@ class HomeTest(ZulipTestCase): def test_notifications_stream(self): # type: () -> None email = 'hamlet@zulip.com' - realm = get_realm('zulip.com') + realm = get_realm_by_string_id('zulip') realm.notifications_stream = get_stream('Denmark', realm) realm.save() self.login(email) @@ -2215,7 +2215,7 @@ class TestMissedMessages(ZulipTestCase): class TestOpenRealms(ZulipTestCase): def test_open_realm_logic(self): # type: () -> None - mit_realm = get_realm("mit.edu") + mit_realm = get_realm_by_string_id("mit") self.assertEquals(get_unique_open_realm(), None) mit_realm.restricted_to_domain = False mit_realm.save()