mirror of
https://github.com/zulip/zulip.git
synced 2025-11-02 13:03:29 +00:00
user_groups: Move constants for system group names to a new class.
This commit moves constants for system group names to a new "SystemGroups" class so that we can use these group names in multiple classes in models.py without worrying about the order of defining them.
This commit is contained in:
@@ -61,6 +61,7 @@ from zerver.models import (
|
||||
Realm,
|
||||
ScheduledEmail,
|
||||
Stream,
|
||||
SystemGroups,
|
||||
UserGroup,
|
||||
UserMessage,
|
||||
UserProfile,
|
||||
@@ -2478,10 +2479,10 @@ class MultiuseInviteTest(ZulipTestCase):
|
||||
def test_create_multiuse_invite_group_setting(self) -> None:
|
||||
realm = get_realm("zulip")
|
||||
full_members_system_group = UserGroup.objects.get(
|
||||
name=UserGroup.FULL_MEMBERS_GROUP_NAME, realm=realm, is_system_group=True
|
||||
name=SystemGroups.FULL_MEMBERS, realm=realm, is_system_group=True
|
||||
)
|
||||
nobody_system_group = UserGroup.objects.get(
|
||||
name=UserGroup.NOBODY_GROUP_NAME, realm=realm, is_system_group=True
|
||||
name=SystemGroups.NOBODY, realm=realm, is_system_group=True
|
||||
)
|
||||
|
||||
# Default value of create_multiuse_invite_group is administrators
|
||||
@@ -2513,7 +2514,7 @@ class MultiuseInviteTest(ZulipTestCase):
|
||||
def test_only_owner_can_change_create_multiuse_invite_group(self) -> None:
|
||||
realm = get_realm("zulip")
|
||||
full_members_system_group = UserGroup.objects.get(
|
||||
name=UserGroup.FULL_MEMBERS_GROUP_NAME, realm=realm, is_system_group=True
|
||||
name=SystemGroups.FULL_MEMBERS, realm=realm, is_system_group=True
|
||||
)
|
||||
|
||||
self.login("iago")
|
||||
@@ -2557,7 +2558,7 @@ class MultiuseInviteTest(ZulipTestCase):
|
||||
def test_multiuse_link_for_inviting_as_admin(self) -> None:
|
||||
realm = get_realm("zulip")
|
||||
full_members_system_group = UserGroup.objects.get(
|
||||
name=UserGroup.FULL_MEMBERS_GROUP_NAME, realm=realm, is_system_group=True
|
||||
name=SystemGroups.FULL_MEMBERS, realm=realm, is_system_group=True
|
||||
)
|
||||
|
||||
do_change_realm_permission_group_setting(
|
||||
@@ -2588,7 +2589,7 @@ class MultiuseInviteTest(ZulipTestCase):
|
||||
def test_multiuse_link_for_inviting_as_moderator(self) -> None:
|
||||
realm = get_realm("zulip")
|
||||
full_members_system_group = UserGroup.objects.get(
|
||||
name=UserGroup.FULL_MEMBERS_GROUP_NAME, realm=realm, is_system_group=True
|
||||
name=SystemGroups.FULL_MEMBERS, realm=realm, is_system_group=True
|
||||
)
|
||||
|
||||
do_change_realm_permission_group_setting(
|
||||
|
||||
Reference in New Issue
Block a user