From 74af803ec34b44be936e0ed6b8317edbd62aeb08 Mon Sep 17 00:00:00 2001 From: Sahil Batra Date: Mon, 12 Jun 2023 16:42:04 +0530 Subject: [PATCH] tests: Use check_add_user_group to create groups. This commit changes the code in test_user_groups.py to use check_add_user_group function to create user groups instead of directly using django ORM to make sure that settings would be set to the correct defaults in further commits. --- zerver/tests/test_user_groups.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/zerver/tests/test_user_groups.py b/zerver/tests/test_user_groups.py index e98515282f..56ae5ec7f0 100644 --- a/zerver/tests/test_user_groups.py +++ b/zerver/tests/test_user_groups.py @@ -103,15 +103,12 @@ class UserGroupTestCase(ZulipTestCase): desdemona = self.example_user("desdemona") shiva = self.example_user("shiva") - leadership_group = UserGroup.objects.create(realm=realm, name="Leadership") - UserGroupMembership.objects.create(user_profile=desdemona, user_group=leadership_group) + leadership_group = check_add_user_group(realm, "Leadership", [desdemona], acting_user=None) - staff_group = UserGroup.objects.create(realm=realm, name="Staff") - UserGroupMembership.objects.create(user_profile=iago, user_group=staff_group) + staff_group = check_add_user_group(realm, "Staff", [iago], acting_user=None) GroupGroupMembership.objects.create(supergroup=staff_group, subgroup=leadership_group) - everyone_group = UserGroup.objects.create(realm=realm, name="Everyone") - UserGroupMembership.objects.create(user_profile=shiva, user_group=everyone_group) + everyone_group = check_add_user_group(realm, "Everyone", [shiva], acting_user=None) GroupGroupMembership.objects.create(supergroup=everyone_group, subgroup=staff_group) self.assertCountEqual(list(get_recursive_subgroups(leadership_group)), [leadership_group])