Adds test support for Django>=2.1

Replaces deprecated FBVs for the new standard CBVs.
This commit is contained in:
Magnun Leno 2018-10-27 02:02:20 -03:00
parent 479a40d2cc
commit 4613875114

View File

@ -1,13 +1,43 @@
# Moved in Django 1.8 from django to tests/auth_tests/urls.py # Moved in Django 1.8 from django to tests/auth_tests/urls.py
import django
from django.conf.urls import url from django.conf.urls import url
from django.contrib.auth import views from django.contrib.auth import views
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.contrib.auth.urls import urlpatterns from django.contrib.auth.urls import urlpatterns
# special urls for auth test cases # special urls for auth test cases
urlpatterns += [ if django.VERSION[0] >= 2 and django.VERSION[1] >= 1:
urlpatterns += [
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'^password_reset_from_email/$',
views.PasswordResetView.as_view(from_email='staffmember@example.com')),
url(r'^password_reset/custom_redirect/$',
views.PasswordResetView.as_view(success_url='/custom/')),
url(r'^password_reset/custom_redirect/named/$',
views.PasswordResetView.as_view(success_url='password_reset')),
url(r'^password_reset/html_email_template/$',
views.PasswordResetView.as_view(html_email_template_name='registration/html_password_reset_email.html')),
url(r'^reset/custom/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
views.PasswordResetConfirmView.as_view(success_url='/custom/')),
url(r'^reset/custom/named/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
views.PasswordResetConfirmView.as_view(success_url='password_reset')),
url(r'^password_change/custom/$',
views.PasswordChangeView.as_view(success_url='/custom/')),
url(r'^password_change/custom/named/$',
views.PasswordChangeView.as_view(success_url='password_reset')),
url(r'^login_required/$',
login_required(views.PasswordResetView.as_view())),
url(r'^login_required_login_url/$',
login_required(views.PasswordResetView.as_view(), login_url='/somewhere/')),
]
else:
urlpatterns += [
url(r'^logout/custom_query/$', views.logout, dict(redirect_field_name='follow')), 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/$', views.logout, dict(next_page='/somewhere/')),
url(r'^logout/next_page/named/$', views.logout, dict(next_page='password_reset')), url(r'^logout/next_page/named/$', views.logout, dict(next_page='password_reset')),
@ -27,4 +57,4 @@ urlpatterns += [
url(r'^admin_password_reset/$', views.password_reset, dict(is_admin_site=True)), url(r'^admin_password_reset/$', views.password_reset, dict(is_admin_site=True)),
url(r'^login_required/$', login_required(views.password_reset)), url(r'^login_required/$', login_required(views.password_reset)),
url(r'^login_required_login_url/$', login_required(views.password_reset, login_url='/somewhere/')), url(r'^login_required_login_url/$', login_required(views.password_reset, login_url='/somewhere/')),
] ]