DGNum/gestioCOF
13
2
Fork 1
Code Issues 77 Pull requests 14 Packages Projects Releases 12 Wiki Activity

Avoid using get_by_natural_key

Browse source
This commit is contained in:
Martin Pépin 2019-12-24 17:13:27 +01:00
parent 64c792b11f
commit 1f945d1af3
No known key found for this signature in database
GPG key ID: E7520278B1774448
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
events/tests/test_views.py
View file

@ -15,8 +15,8 @@ def make_user(name):
def make_staff_user(name): def make_staff_user(name):
view_event_perm = Permission.objects.get_by_natural_key( view_event_perm = Permission.objects.get(
codename="view_event", app_label="events", model="event" codename="view_event", content_type__app_label="events",
) )
user = make_user(name) user = make_user(name)
user.user_permissions.add(view_event_perm) user.user_permissions.add(view_event_perm)

16
kfet/open/tests.py
View file

@ -84,7 +84,9 @@ class OpenKfetTest(ChannelTestCase):
def test_export_team(self): def test_export_team(self):
"""Export all values for a team member.""" """Export all values for a team member."""
user = User.objects.create_user("team", "", "team") 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) user.user_permissions.add(is_team)
export = self.kfet_open.export(user) export = self.kfet_open.export(user)
self.assertSetEqual(set(["status", "admin_status", "force_close"]), set(export)) self.assertSetEqual(set(["status", "admin_status", "force_close"]), set(export))
@ -115,11 +117,11 @@ class OpenKfetViewsTest(ChannelTestCase):
# get some permissions # get some permissions
perms = { perms = {
"kfet.is_team": Permission.objects.get_by_natural_key( "kfet.is_team": Permission.objects.get(
"is_team", "kfet", "account" codename="is_team", content_type__app_label="kfet"
), ),
"kfet.can_force_close": Permission.objects.get_by_natural_key( "kfet.can_force_close": Permission.objects.get(
"can_force_close", "kfet", "account" 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.""" """Team user is added to kfet.open.team group."""
# setup team user and its client # setup team user and its client
t = User.objects.create_user("team", "", "team") 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) t.user_permissions.add(is_team)
c = WSClient() c = WSClient()
c.force_login(t) c.force_login(t)

4
kfet/tests/test_statistic.py
View file

@ -18,7 +18,9 @@ class TestStats(TestCase):
user.set_password("foobar") user.set_password("foobar")
user.save() user.save()
Account.objects.create(trigramme="FOO", cofprofile=user.profile) 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) user.user_permissions.add(perm)
user2 = User.objects.create(username="Barfoo") user2 = User.objects.create(username="Barfoo")