diff options
Diffstat (limited to 'tests/auth_tests')
| -rw-r--r-- | tests/auth_tests/test_views.py | 10 | ||||
| -rw-r--r-- | tests/auth_tests/urls.py | 17 |
2 files changed, 13 insertions, 14 deletions
diff --git a/tests/auth_tests/test_views.py b/tests/auth_tests/test_views.py index 5b4b877c47..bd01c67d70 100644 --- a/tests/auth_tests/test_views.py +++ b/tests/auth_tests/test_views.py @@ -15,7 +15,7 @@ from django.contrib.auth.forms import ( AuthenticationForm, PasswordChangeForm, SetPasswordForm, ) from django.contrib.auth.models import User -from django.contrib.auth.views import login as login_view, redirect_to_login +from django.contrib.auth.views import LoginView, redirect_to_login from django.contrib.sessions.middleware import SessionMiddleware from django.contrib.sites.requests import RequestSite from django.core import mail @@ -553,10 +553,10 @@ class LoginTest(AuthViewsTestCase): # Do a GET to establish a CSRF token # TestClient isn't used here as we're testing middleware, essentially. req = HttpRequest() - CsrfViewMiddleware().process_view(req, login_view, (), {}) + CsrfViewMiddleware().process_view(req, LoginView.as_view(), (), {}) # get_token() triggers CSRF token inclusion in the response get_token(req) - resp = login_view(req) + resp = LoginView.as_view()(req) resp2 = CsrfViewMiddleware().process_response(req, resp) csrf_cookie = resp2.cookies.get(settings.CSRF_COOKIE_NAME, None) token1 = csrf_cookie.coded_value @@ -569,10 +569,10 @@ class LoginTest(AuthViewsTestCase): # Use POST request to log in SessionMiddleware().process_request(req) - CsrfViewMiddleware().process_view(req, login_view, (), {}) + CsrfViewMiddleware().process_view(req, LoginView.as_view(), (), {}) req.META["SERVER_NAME"] = "testserver" # Required to have redirect work in login view req.META["SERVER_PORT"] = 80 - resp = login_view(req) + resp = LoginView.as_view()(req) resp2 = CsrfViewMiddleware().process_response(req, resp) csrf_cookie = resp2.cookies.get(settings.CSRF_COOKIE_NAME, None) token2 = csrf_cookie.coded_value diff --git a/tests/auth_tests/urls.py b/tests/auth_tests/urls.py index 2b70c59a51..c6dd632e0a 100644 --- a/tests/auth_tests/urls.py +++ b/tests/auth_tests/urls.py @@ -61,14 +61,11 @@ def userpage(request): pass -def custom_request_auth_login(request): - return views.login(request, authentication_form=CustomRequestAuthenticationForm) - # special urls for auth test cases urlpatterns = auth_urlpatterns + [ - url(r'^logout/custom_query/$', views.logout, dict(redirect_field_name='follow')), - url(r'^logout/next_page/$', views.logout, dict(next_page='/somewhere/')), - url(r'^logout/next_page/named/$', views.logout, dict(next_page='password_reset')), + url(r'^logout/custom_query/$', views.LogoutView.as_view(redirect_field_name='follow')), + url(r'^logout/next_page/$', views.LogoutView.as_view(next_page='/somewhere/')), + url(r'^logout/next_page/named/$', views.LogoutView.as_view(next_page='password_reset')), url(r'^remote_user/$', remote_user_auth_view), url(r'^password_reset_from_email/$', views.password_reset, dict(from_email='staffmember@example.com')), url(r'^password_reset_extra_email_context/$', views.password_reset, @@ -94,10 +91,12 @@ urlpatterns = auth_urlpatterns + [ url(r'^auth_processor_perms/$', auth_processor_perms), url(r'^auth_processor_perm_in_perms/$', auth_processor_perm_in_perms), url(r'^auth_processor_messages/$', auth_processor_messages), - url(r'^custom_request_auth_login/$', custom_request_auth_login), + url(r'^custom_request_auth_login/$', + views.LoginView.as_view(authentication_form=CustomRequestAuthenticationForm)), url(r'^userpage/(.+)/$', userpage, name="userpage"), - url(r'^login/redirect_authenticated_user_default/$', views.login), - url(r'^login/redirect_authenticated_user/$', views.login, dict(redirect_authenticated_user=True)), + url(r'^login/redirect_authenticated_user_default/$', views.LoginView.as_view()), + url(r'^login/redirect_authenticated_user/$', + views.LoginView.as_view(redirect_authenticated_user=True)), # This line is only required to render the password reset with is_admin=True url(r'^admin/', admin.site.urls), |