tests: Use NamedUserGroup for queries.

This commit is contained in:
Sahil Batra
2024-04-18 15:53:46 +05:30
committed by Tim Abbott
parent a96c8b8352
commit e78d0aacaf
13 changed files with 143 additions and 123 deletions

View File

@@ -115,7 +115,6 @@ from zerver.models import (
Realm,
RealmDomain,
Stream,
UserGroup,
UserProfile,
)
from zerver.models.realms import clear_supported_auth_backends_cache, get_realm
@@ -7498,13 +7497,17 @@ class LDAPGroupSyncTest(ZulipTestCase):
},
LDAP_APPEND_DOMAIN="zulip.com",
), self.assertLogs("zulip.ldap", "DEBUG") as zulip_ldap_log:
self.assertFalse(UserGroup.objects.filter(realm=realm, name="cool_test_group").exists())
self.assertFalse(
NamedUserGroup.objects.filter(realm=realm, name="cool_test_group").exists()
)
create_user_group_in_database(
"cool_test_group", [], realm, acting_user=None, description="Created by LDAP sync"
)
self.assertTrue(UserGroup.objects.filter(realm=realm, name="cool_test_group").exists())
self.assertTrue(
NamedUserGroup.objects.filter(realm=realm, name="cool_test_group").exists()
)
user_group = NamedUserGroup.objects.get(realm=realm, name="cool_test_group")
@@ -7537,7 +7540,7 @@ class LDAPGroupSyncTest(ZulipTestCase):
self.assertTrue(
is_user_in_group(
UserGroup.objects.get(realm=realm, name="cool_test_group"),
NamedUserGroup.objects.get(realm=realm, name="cool_test_group"),
cordelia,
direct_member_only=True,
)
@@ -7548,7 +7551,7 @@ class LDAPGroupSyncTest(ZulipTestCase):
self.assertFalse(
is_user_in_group(
UserGroup.objects.get(realm=realm, name="cool_test_group"),
NamedUserGroup.objects.get(realm=realm, name="cool_test_group"),
cordelia,
direct_member_only=True,
)