paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-17 04:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Make acting_user a mandatory kwarg for do_activate_user.

Browse Source
This commit is contained in:
shanukun
2021-02-06 21:32:03 +05:30
committed by Tim Abbott
parent 4b67946605
commit fafe1a31d7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
analytics/tests/test_counts.py
View File

@@ -1325,7 +1325,7 @@ class TestLoggingCountStats(AnalyticsTestCase):
"value__sum" "value__sum"
], ],
) )
do_activate_user(user) do_activate_user(user, acting_user=None)
self.assertEqual( self.assertEqual(
1, 1,
RealmCount.objects.filter(property=property, subgroup=False).aggregate(Sum("value"))[ RealmCount.objects.filter(property=property, subgroup=False).aggregate(Sum("value"))[
@@ -1659,7 +1659,7 @@ class TestActiveUsersAudit(AnalyticsTestCase):
"email4", "password", self.default_realm, "full_name", acting_user=None "email4", "password", self.default_realm, "full_name", acting_user=None
) )
do_deactivate_user(user2) do_deactivate_user(user2)
do_activate_user(user3) do_activate_user(user3, acting_user=None)
do_reactivate_user(user4) do_reactivate_user(user4)
end_time = floor_to_day(timezone_now()) + self.DAY end_time = floor_to_day(timezone_now()) + self.DAY
do_fill_count_stat_at_hour(self.stat, end_time) do_fill_count_stat_at_hour(self.stat, end_time)

2
corporate/tests/test_stripe.py
View File

@@ -2714,7 +2714,7 @@ class LicenseLedgerTest(StripeTestCase):
do_deactivate_user(user) do_deactivate_user(user)
do_reactivate_user(user) do_reactivate_user(user)
# Not a proper use of do_activate_user, but fine for this test # Not a proper use of do_activate_user, but fine for this test
do_activate_user(user) do_activate_user(user, acting_user=None)
ledger_entries = list( ledger_entries = list(
LicenseLedger.objects.values_list( LicenseLedger.objects.values_list(
"is_renewal", "licenses", "licenses_at_next_renewal" "is_renewal", "licenses", "licenses_at_next_renewal"

2
zerver/lib/actions.py
View File

@@ -672,7 +672,7 @@ def do_create_user(
return user_profile return user_profile
def do_activate_user(user_profile: UserProfile, acting_user: Optional[UserProfile] = None) -> None: def do_activate_user(user_profile: UserProfile, *, acting_user: Optional[UserProfile]) -> None:
user_profile.is_active = True user_profile.is_active = True
user_profile.is_mirror_dummy = False user_profile.is_mirror_dummy = False
user_profile.set_unusable_password() user_profile.set_unusable_password()