Ticket #24276: 24276-test.diff

django/contrib/auth/decorators.py

@@ -21 +21 @@
             if test_func(request.user):
                 return view_func(request, *args, **kwargs)
             path = request.build_absolute_uri()
-            resolved_login_url = resolve_url(login_url or settings.LOGIN_URL)
+            resolved_login_url = resolve_url(login_url or settings.LOGIN_URL, *args, **kwargs)
             # If the login url is the same scheme and net location then just
             # use the path as the "next" url.
             login_scheme, login_netloc = urlparse(resolved_login_url)[:2]

tests/urlpatterns_reverse/reverse_lazy_urls.py

@@ -5 +5 @@
 urlpatterns = [
     url(r'^redirected_to/$', empty_view, name='named-lazy-url-redirected-to'),
     url(r'^login/$', empty_view, name='some-login-page'),
-    url(r'^login_required_view/$', login_required_view),
+    url(r'^(\d{4})/login_required_view/$', login_required_view),
     url(r'^redirect/$', LazyRedirectView.as_view()),
 ]

tests/urlpatterns_reverse/tests.py

@@ -317 +317 @@
 
     def test_user_permission_with_lazy_reverse(self):
         User.objects.create_user('alfred', 'alfred@example.com', password='testpw')
-        response = self.client.get('/login_required_view/')
-        self.assertRedirects(response, "/login/?next=/login_required_view/", status_code=302)
+        response = self.client.get('/1986/login_required_view/')
+        self.assertRedirects(response, "/login/?next=/1986/login_required_view/", status_code=302)
         self.client.login(username='alfred', password='testpw')
         response = self.client.get('/login_required_view/')
         self.assertEqual(response.status_code, 200)

tests/urlpatterns_reverse/views.py

@@ -49 +49 @@
     url = reverse_lazy('named-lazy-url-redirected-to')
 
 
-@user_passes_test(lambda u: u.is_authenticated(), login_url=reverse_lazy('some-login-page'))
+@user_passes_test(lambda u: u.is_authenticated(), login_url='some-login-page')
 def login_required_view(request):
     return HttpResponse('Hello you')