summaryrefslogtreecommitdiff
path: root/tests/regressiontests/generic_inline_admin
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2011-10-07 00:41:25 +0000
committerCarl Meyer <carl@oddbird.net>2011-10-07 00:41:25 +0000
commitb1b1da1eac93297503c04b8394fb98e38f552f5f (patch)
tree774b258c552e330f98ee8f437e76b6159c8500b4 /tests/regressiontests/generic_inline_admin
parente2f9c11736db9e23004733760303f605f1cfb924 (diff)
Fixed #8060 - Added permissions-checking for admin inlines. Thanks p.patruno for report and Stephan Jaensch for work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/generic_inline_admin')
-rw-r--r--tests/regressiontests/generic_inline_admin/tests.py22
1 files changed, 14 insertions, 8 deletions
diff --git a/tests/regressiontests/generic_inline_admin/tests.py b/tests/regressiontests/generic_inline_admin/tests.py
index 858d6a5f3b..baea85717b 100644
--- a/tests/regressiontests/generic_inline_admin/tests.py
+++ b/tests/regressiontests/generic_inline_admin/tests.py
@@ -216,6 +216,18 @@ class NoInlineDeletionTest(TestCase):
formset = inline.get_formset(fake_request)
self.assertFalse(formset.can_delete)
+
+class MockRequest(object):
+ pass
+
+class MockSuperUser(object):
+ def has_perm(self, perm):
+ return True
+
+request = MockRequest()
+request.user = MockSuperUser()
+
+
class GenericInlineModelAdminTest(TestCase):
urls = "regressiontests.generic_inline_admin.urls"
@@ -226,12 +238,12 @@ class GenericInlineModelAdminTest(TestCase):
media_inline = MediaInline(Media, AdminSite())
# Create a formset with default arguments
- formset = media_inline.get_formset(None)
+ formset = media_inline.get_formset(request)
self.assertEqual(formset.max_num, None)
self.assertEqual(formset.can_order, False)
# Create a formset with custom keyword arguments
- formset = media_inline.get_formset(None, max_num=100, can_order=True)
+ formset = media_inline.get_formset(request, max_num=100, can_order=True)
self.assertEqual(formset.max_num, 100)
self.assertEqual(formset.can_order, True)
@@ -241,9 +253,6 @@ class GenericInlineModelAdminTest(TestCase):
used in conjunction with `GenericInlineModelAdmin.readonly_fields`
and when no `ModelAdmin.exclude` is defined.
"""
-
- request = None
-
class MediaForm(ModelForm):
class Meta:
@@ -272,9 +281,6 @@ class GenericInlineModelAdminTest(TestCase):
`ModelAdmin.exclude` or `GenericInlineModelAdmin.exclude` are defined.
Refs #15907.
"""
-
- request = None
-
# First with `GenericInlineModelAdmin` -----------------
class MediaForm(ModelForm):