From a08155b09e53f99c46121fba2ac20886738e064d Mon Sep 17 00:00:00 2001 From: Harshit Bansal Date: Fri, 31 Mar 2017 17:57:46 +0000 Subject: [PATCH] actions.py: Rename `do_change_realm_alias()` to `do_change_realm_domain()`. --- zerver/lib/actions.py | 2 +- zerver/tests/test_events.py | 4 ++-- zerver/tests/test_realm_aliases.py | 8 ++++---- zerver/views/realm_aliases.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 739695fb7f..b1cb6e4235 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -3231,7 +3231,7 @@ def do_add_realm_domain(realm, domain, allow_subdomains): send_event(event, active_user_ids(realm)) return alias -def do_change_realm_alias(alias, allow_subdomains): +def do_change_realm_domain(alias, allow_subdomains): # type: (RealmDomain, bool) -> None alias.allow_subdomains = allow_subdomains alias.save(update_fields=['allow_subdomains']) diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index 503c512559..1606f720f0 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -71,7 +71,7 @@ from zerver.lib.actions import ( do_change_pm_content_in_desktop_notifications, do_change_enable_digest_emails, do_add_realm_domain, - do_change_realm_alias, + do_change_realm_domain, do_remove_realm_alias, do_change_icon_source, ) @@ -1156,7 +1156,7 @@ class EventsRegisterTest(ZulipTestCase): ])), ]) alias = RealmDomain.objects.get(realm=realm, domain='zulip.org') - events = self.do_test(lambda: do_change_realm_alias(alias, True)) + events = self.do_test(lambda: do_change_realm_domain(alias, True)) error = schema_checker('events[0]', events[0]) self.assert_on_error(error) diff --git a/zerver/tests/test_realm_aliases.py b/zerver/tests/test_realm_aliases.py index 98515ba07d..326adbd6c6 100644 --- a/zerver/tests/test_realm_aliases.py +++ b/zerver/tests/test_realm_aliases.py @@ -6,7 +6,7 @@ from django.db.utils import IntegrityError from typing import Optional, Text from zerver.lib.actions import do_change_is_admin, \ - do_change_realm_alias, do_create_realm, \ + do_change_realm_domain, do_create_realm, \ do_remove_realm_alias from zerver.lib.domains import validate_domain from zerver.lib.test_classes import ZulipTestCase @@ -146,11 +146,11 @@ class RealmDomainTest(ZulipTestCase): assert_and_check('user@test2.test2.test1.com', 'testrealm1') assert_and_check('user@test1.test3.test2.test1.com', 'testrealm3') - do_change_realm_alias(alias1, False) + do_change_realm_domain(alias1, False) assert_and_check('user@test1.test1.com', None) assert_and_check('user@test1.com', 'testrealm1') - do_change_realm_alias(alias2, True) + do_change_realm_domain(alias2, True) assert_and_check('user@test2.test1.com', 'testrealm2') assert_and_check('user@test2.test2.test1.com', 'testrealm2') @@ -172,7 +172,7 @@ class RealmDomainTest(ZulipTestCase): self.assertEqual(email_allowed_for_realm('user@test3.test2.test1.com', realm2), True) self.assertEqual(email_allowed_for_realm('user@test3.test1.com', realm2), False) - do_change_realm_alias(alias, True) + do_change_realm_domain(alias, True) self.assertEqual(email_allowed_for_realm('user@test1.com', realm1), True) self.assertEqual(email_allowed_for_realm('user@test2.test1.com', realm1), True) self.assertEqual(email_allowed_for_realm('user@test2.com', realm1), False) diff --git a/zerver/views/realm_aliases.py b/zerver/views/realm_aliases.py index 4a88e355a0..8224bad77b 100644 --- a/zerver/views/realm_aliases.py +++ b/zerver/views/realm_aliases.py @@ -5,7 +5,7 @@ from django.http import HttpRequest, HttpResponse from django.utils.translation import ugettext as _ from zerver.decorator import has_request_variables, require_realm_admin, REQ -from zerver.lib.actions import do_add_realm_domain, do_change_realm_alias, \ +from zerver.lib.actions import do_add_realm_domain, do_change_realm_domain, \ do_remove_realm_alias, get_realm_domains from zerver.lib.domains import validate_domain from zerver.lib.response import json_error, json_success @@ -41,7 +41,7 @@ def patch_alias(request, user_profile, domain, allow_subdomains=REQ(validator=ch # type: (HttpRequest, UserProfile, Text, bool) -> (HttpResponse) try: alias = RealmDomain.objects.get(realm=user_profile.realm, domain=domain) - do_change_realm_alias(alias, allow_subdomains) + do_change_realm_domain(alias, allow_subdomains) except RealmDomain.DoesNotExist: return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain})) return json_success()