innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.11.x] Factored out uid/user tokens in auth_tests urlpatterns. 

Backport of 72ff9d53e6 from master
This commit is contained in:
Tim Graham 2017-03-07 13:43:17 -05:00
parent 89b31b312e
commit 36d640cd1f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auth_tests/urls.py
View File

@ -62,6 +62,8 @@ def userpage(request):
pass pass
uid_token = '(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})'
# special urls for auth test cases # special urls for auth test cases
urlpatterns = auth_urlpatterns + [ urlpatterns = auth_urlpatterns + [
url(r'^logout/custom_query/$', views.LogoutView.as_view(redirect_field_name='follow')), url(r'^logout/custom_query/$', views.LogoutView.as_view(redirect_field_name='follow')),
@ -82,11 +84,11 @@ urlpatterns = auth_urlpatterns + [
views.PasswordResetView.as_view( views.PasswordResetView.as_view(
html_email_template_name='registration/html_password_reset_email.html' 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})/$', url(r'^reset/custom/{}/$'.format(uid_token),
views.PasswordResetConfirmView.as_view(success_url='/custom/')), 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})/$', url(r'^reset/custom/named/{}/$'.format(uid_token),
views.PasswordResetConfirmView.as_view(success_url=reverse_lazy('password_reset'))), views.PasswordResetConfirmView.as_view(success_url=reverse_lazy('password_reset'))),
url(r'^reset/post_reset_login/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', url(r'^reset/post_reset_login/{}/$'.format(uid_token),
views.PasswordResetConfirmView.as_view(post_reset_login=True)), views.PasswordResetConfirmView.as_view(post_reset_login=True)),
url(r'^password_change/custom/$', url(r'^password_change/custom/$',
views.PasswordChangeView.as_view(success_url='/custom/')), views.PasswordChangeView.as_view(success_url='/custom/')),