paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

actions.py: Rename do_change_realm_alias() to do_change_realm_domain().

Browse Source
This commit is contained in:
Harshit Bansal
2017-03-31 17:57:46 +00:00
committed by Tim Abbott
parent 2da4fc0dc4
commit a08155b09e
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/actions.py
View File

@@ -3231,7 +3231,7 @@ def do_add_realm_domain(realm, domain, allow_subdomains):
send_event(event, active_user_ids(realm)) send_event(event, active_user_ids(realm))
return alias return alias
def do_change_realm_alias(alias, allow_subdomains): def do_change_realm_domain(alias, allow_subdomains):
# type: (RealmDomain, bool) -> None # type: (RealmDomain, bool) -> None
alias.allow_subdomains = allow_subdomains alias.allow_subdomains = allow_subdomains
alias.save(update_fields=['allow_subdomains']) alias.save(update_fields=['allow_subdomains'])

4
zerver/tests/test_events.py
View File

@@ -71,7 +71,7 @@ from zerver.lib.actions import (
do_change_pm_content_in_desktop_notifications, do_change_pm_content_in_desktop_notifications,
do_change_enable_digest_emails, do_change_enable_digest_emails,
do_add_realm_domain, do_add_realm_domain,
do_change_realm_alias, do_change_realm_domain,
do_remove_realm_alias, do_remove_realm_alias,
do_change_icon_source, do_change_icon_source,
) )
@@ -1156,7 +1156,7 @@ class EventsRegisterTest(ZulipTestCase):
])), ])),
]) ])
alias = RealmDomain.objects.get(realm=realm, domain='zulip.org') 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]) error = schema_checker('events[0]', events[0])
self.assert_on_error(error) self.assert_on_error(error)

8
zerver/tests/test_realm_aliases.py
View File

@@ -6,7 +6,7 @@ from django.db.utils import IntegrityError
from typing import Optional, Text from typing import Optional, Text
from zerver.lib.actions import do_change_is_admin, \ 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 do_remove_realm_alias
from zerver.lib.domains import validate_domain from zerver.lib.domains import validate_domain
from zerver.lib.test_classes import ZulipTestCase 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@test2.test2.test1.com', 'testrealm1')
assert_and_check('user@test1.test3.test2.test1.com', 'testrealm3') 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.test1.com', None)
assert_and_check('user@test1.com', 'testrealm1') 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.test1.com', 'testrealm2')
assert_and_check('user@test2.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.test2.test1.com', realm2), True)
self.assertEqual(email_allowed_for_realm('user@test3.test1.com', realm2), False) 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@test1.com', realm1), True)
self.assertEqual(email_allowed_for_realm('user@test2.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) self.assertEqual(email_allowed_for_realm('user@test2.com', realm1), False)

4
zerver/views/realm_aliases.py
View File

@@ -5,7 +5,7 @@ from django.http import HttpRequest, HttpResponse
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from zerver.decorator import has_request_variables, require_realm_admin, REQ 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 do_remove_realm_alias, get_realm_domains
from zerver.lib.domains import validate_domain from zerver.lib.domains import validate_domain
from zerver.lib.response import json_error, json_success 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) # type: (HttpRequest, UserProfile, Text, bool) -> (HttpResponse)
try: try:
alias = RealmDomain.objects.get(realm=user_profile.realm, domain=domain) 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: except RealmDomain.DoesNotExist:
return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain})) return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain}))
return json_success() return json_success()