summaryrefslogtreecommitdiff
path: root/tests/admin_views
diff options
context:
space:
mode:
authorAndrei Kulakov <andrei.avk@gmail.com>2015-02-06 16:45:46 -0500
committerTim Graham <timograham@gmail.com>2015-03-02 13:15:34 -0500
commit08572e8d125da204fab230be5d1fdcc5d8d22256 (patch)
tree7284e65c145824add2b751ee5f8632e327128b6f /tests/admin_views
parent4e8b167e4d0817b6ae93be8ad97b31bf203698d8 (diff)
Fixed #24294 -- Allowed staff_member_required decorator to handle args.
Diffstat (limited to 'tests/admin_views')
-rw-r--r--tests/admin_views/tests.py9
-rw-r--r--tests/admin_views/urls.py1
-rw-r--r--tests/admin_views/views.py5
3 files changed, 15 insertions, 0 deletions
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index d57a321951..5ec7bc0de2 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -2125,6 +2125,15 @@ class SecureViewTests(TestCase):
self.assertTemplateUsed(response, 'admin/login.html')
self.assertEqual(response.context[REDIRECT_FIELD_NAME], secure_url)
+ def test_staff_member_required_decorator_works_with_argument(self):
+ """
+ Ensure that staff_member_required decorator works with an argument
+ (redirect_field_name).
+ """
+ secure_url = '/test_admin/admin/secure-view2/'
+ response = self.client.get(secure_url)
+ self.assertRedirects(response, '%s?myfield=%s' % (reverse('admin:login'), secure_url))
+
@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
ROOT_URLCONF="admin_views.urls")
diff --git a/tests/admin_views/urls.py b/tests/admin_views/urls.py
index ba6a89424b..679ae916af 100644
--- a/tests/admin_views/urls.py
+++ b/tests/admin_views/urls.py
@@ -5,6 +5,7 @@ from . import admin, custom_has_permission_admin, customadmin, views
urlpatterns = [
url(r'^test_admin/admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^test_admin/admin/secure-view/$', views.secure_view, name='secure_view'),
+ url(r'^test_admin/admin/secure-view2/$', views.secure_view2, name='secure_view2'),
url(r'^test_admin/admin/', include(admin.site.urls)),
url(r'^test_admin/admin2/', include(customadmin.site.urls)),
url(r'^test_admin/admin3/', include(admin.site.get_urls(), 'admin3', 'admin'), dict(form_url='pony')),
diff --git a/tests/admin_views/views.py b/tests/admin_views/views.py
index cfae496aba..2cda42fe54 100644
--- a/tests/admin_views/views.py
+++ b/tests/admin_views/views.py
@@ -5,3 +5,8 @@ from django.http import HttpResponse
@staff_member_required
def secure_view(request):
return HttpResponse('%s' % request.POST)
+
+
+@staff_member_required(redirect_field_name='myfield')
+def secure_view2(request):
+ return HttpResponse('%s' % request.POST)