Browse Source

Factored out uid/user tokens in auth_tests urlpatterns.

Tim Graham 8 years ago
parent
commit
72ff9d53e6
1 changed files with 5 additions and 3 deletions
  1. 5 3
      tests/auth_tests/urls.py

+ 5 - 3
tests/auth_tests/urls.py

@@ -62,6 +62,8 @@ def userpage(request):
     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
 urlpatterns = auth_urlpatterns + [
     url(r'^logout/custom_query/$', views.LogoutView.as_view(redirect_field_name='follow')),
@@ -82,11 +84,11 @@ urlpatterns = auth_urlpatterns + [
         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})/$',
+    url(r'^reset/custom/{}/$'.format(uid_token),
         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'))),
-    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)),
     url(r'^password_change/custom/$',
         views.PasswordChangeView.as_view(success_url='/custom/')),