From 1f945d1af3a2d8a72d9e1a9caf465e4dfe1346d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Tue, 24 Dec 2019 17:13:27 +0100 Subject: [PATCH] Avoid using `get_by_natural_key` --- events/tests/test_views.py | 4 ++-- kfet/open/tests.py | 16 ++++++++++------ kfet/tests/test_statistic.py | 4 +++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/events/tests/test_views.py b/events/tests/test_views.py index 8dd81df7..5dc01fbb 100644 --- a/events/tests/test_views.py +++ b/events/tests/test_views.py @@ -15,8 +15,8 @@ def make_user(name): def make_staff_user(name): - view_event_perm = Permission.objects.get_by_natural_key( - codename="view_event", app_label="events", model="event" + view_event_perm = Permission.objects.get( + codename="view_event", content_type__app_label="events", ) user = make_user(name) user.user_permissions.add(view_event_perm) diff --git a/kfet/open/tests.py b/kfet/open/tests.py index ae9bfa4b..0d527644 100644 --- a/kfet/open/tests.py +++ b/kfet/open/tests.py @@ -84,7 +84,9 @@ class OpenKfetTest(ChannelTestCase): def test_export_team(self): """Export all values for a team member.""" user = User.objects.create_user("team", "", "team") - is_team = Permission.objects.get_by_natural_key("is_team", "kfet", "account") + is_team = Permission.objects.get( + codename="is_team", content_type__app_label="kfet" + ) user.user_permissions.add(is_team) export = self.kfet_open.export(user) self.assertSetEqual(set(["status", "admin_status", "force_close"]), set(export)) @@ -115,11 +117,11 @@ class OpenKfetViewsTest(ChannelTestCase): # get some permissions perms = { - "kfet.is_team": Permission.objects.get_by_natural_key( - "is_team", "kfet", "account" + "kfet.is_team": Permission.objects.get( + codename="is_team", content_type__app_label="kfet" ), - "kfet.can_force_close": Permission.objects.get_by_natural_key( - "can_force_close", "kfet", "account" + "kfet.can_force_close": Permission.objects.get( + codename="can_force_close", content_type__app_label="kfet" ), } @@ -204,7 +206,9 @@ class OpenKfetConsumerTest(ChannelTestCase): """Team user is added to kfet.open.team group.""" # setup team user and its client t = User.objects.create_user("team", "", "team") - is_team = Permission.objects.get_by_natural_key("is_team", "kfet", "account") + is_team = Permission.objects.get( + codename="is_team", content_type__app_label="kfet" + ) t.user_permissions.add(is_team) c = WSClient() c.force_login(t) diff --git a/kfet/tests/test_statistic.py b/kfet/tests/test_statistic.py index 9fafada4..a5e3192c 100644 --- a/kfet/tests/test_statistic.py +++ b/kfet/tests/test_statistic.py @@ -18,7 +18,9 @@ class TestStats(TestCase): user.set_password("foobar") user.save() Account.objects.create(trigramme="FOO", cofprofile=user.profile) - perm = Permission.objects.get_by_natural_key("is_team", "kfet", "account") + perm = Permission.objects.get( + codename="is_team", content_type__app_label="kfet" + ) user.user_permissions.add(perm) user2 = User.objects.create(username="Barfoo")