mirror of
https://github.com/zulip/zulip.git
synced 2025-10-30 03:23:50 +00:00
tests: Use NamedUserGroup for queries.
This commit is contained in:
@@ -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,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user