mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Updated tests for deprecation of Option.get_(add|change|delete)_permission.

Browse Source 
refs #20642.
This commit is contained in:
Tim Graham
2013-07-01 09:19:55 -04:00
parent cfcf4b3605
commit a6a905c619
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/admin_views/tests.py
View File

@@ -15,6 +15,7 @@ from django.core.files import temp as tempfile
from django.core.urlresolvers import reverse
# Register auth models with the admin.
from django.contrib import admin
from django.contrib.auth import get_permission_codename
from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
from django.contrib.admin.models import LogEntry, DELETION
from django.contrib.admin.sites import LOGIN_FORM_KEY
@@ -854,20 +855,20 @@ class AdminViewPermissionsTest(TestCase):
# User who can add Articles
add_user = User.objects.get(username='adduser')
add_user.user_permissions.add(get_perm(Article,
opts.get_add_permission()))
get_permission_codename('add', opts)))
# User who can change Articles
change_user = User.objects.get(username='changeuser')
change_user.user_permissions.add(get_perm(Article,
opts.get_change_permission()))
get_permission_codename('change', opts)))
# User who can delete Articles
delete_user = User.objects.get(username='deleteuser')
delete_user.user_permissions.add(get_perm(Article,
opts.get_delete_permission()))
get_permission_codename('delete', opts)))
delete_user.user_permissions.add(get_perm(Section,
Section._meta.get_delete_permission()))
get_permission_codename('delete', Section._meta)))
# login POST dicts
self.super_login = {
@@ -1210,7 +1211,7 @@ class AdminViewPermissionsTest(TestCase):
# Allow the add user to add sections too. Now they can see the "add
# section" link.
add_user = User.objects.get(username='adduser')
perm = get_perm(Section, Section._meta.get_add_permission())
perm = get_perm(Section, get_permission_codename('add', Section._meta))
add_user.user_permissions.add(perm)
response = self.client.get(url)
self.assertContains(response, add_link_text)
@@ -1315,7 +1316,7 @@ class AdminViewsNoUrlTest(TestCase):
# User who can change Reports
change_user = User.objects.get(username='changeuser')
change_user.user_permissions.add(get_perm(Report,
opts.get_change_permission()))
get_permission_codename('change', opts)))
# login POST dict
self.changeuser_login = {
@@ -1372,7 +1373,7 @@ class AdminViewDeletedObjectsTest(TestCase):
self.client.logout()
delete_user = User.objects.get(username='deleteuser')
delete_user.user_permissions.add(get_perm(Plot,
Plot._meta.get_delete_permission()))
get_permission_codename('delete', Plot._meta)))
self.assertTrue(self.client.login(username='deleteuser',
password='secret'))