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

refactor: Make acting_user a mandatory kwarg for do_scrub_realm.

Browse Source
This commit is contained in:
shanukun
2021-04-02 21:03:33 +05:30
committed by Tim Abbott
parent 4b00e5da72
commit f442e9fb03
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/actions.py
View File

@@ -1057,7 +1057,7 @@ def do_add_deactivated_redirect(realm: Realm, redirect_url: str) -> None:
realm.save(update_fields=["deactivated_redirect"]) realm.save(update_fields=["deactivated_redirect"])
def do_scrub_realm(realm: Realm, acting_user: Optional[UserProfile] = None) -> None: def do_scrub_realm(realm: Realm, *, acting_user: Optional[UserProfile]) -> None:
if settings.BILLING_ENABLED: if settings.BILLING_ENABLED:
downgrade_now_without_creating_additional_invoices(realm) downgrade_now_without_creating_additional_invoices(realm)

2
zerver/tests/test_realm.py
View File

@@ -958,7 +958,7 @@ class ScrubRealmTest(ZulipTestCase):
self.assertNotEqual(CustomProfileField.objects.filter(realm=zulip).count(), 0) self.assertNotEqual(CustomProfileField.objects.filter(realm=zulip).count(), 0)
with self.assertLogs(level="WARNING"): with self.assertLogs(level="WARNING"):
do_scrub_realm(zulip) do_scrub_realm(zulip, acting_user=None)
self.assertEqual(Message.objects.filter(sender__in=[iago, othello]).count(), 0) self.assertEqual(Message.objects.filter(sender__in=[iago, othello]).count(), 0)
self.assertEqual(Message.objects.filter(sender__in=[cordelia, king]).count(), 10) self.assertEqual(Message.objects.filter(sender__in=[cordelia, king]).count(), 10)