diff options
| author | Tim Graham <timograham@gmail.com> | 2015-09-02 18:36:09 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-23 19:31:10 -0400 |
| commit | 6eed9ae747a0178de817da2e56bd09e73bee84ad (patch) | |
| tree | cd75546652a242202eb60d0617734476769b79c8 /tests/generic_views | |
| parent | b6e6fcf326ff3b008ccd7e935c391432d95bc5e2 (diff) | |
Refs #24133 -- Removed legacy formatting syntax in success_url placeholders.
Per deprecation timeline.
Diffstat (limited to 'tests/generic_views')
| -rw-r--r-- | tests/generic_views/test_edit.py | 7 | ||||
| -rw-r--r-- | tests/generic_views/urls.py | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/tests/generic_views/test_edit.py b/tests/generic_views/test_edit.py index e93965a670..669a70639d 100644 --- a/tests/generic_views/test_edit.py +++ b/tests/generic_views/test_edit.py @@ -5,9 +5,7 @@ import warnings from django import forms from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import reverse -from django.test import ( - SimpleTestCase, TestCase, ignore_warnings, override_settings, -) +from django.test import SimpleTestCase, TestCase, override_settings from django.test.client import RequestFactory from django.utils.deprecation import RemovedInDjango110Warning from django.views.generic.base import View @@ -152,7 +150,6 @@ class CreateViewTests(TestCase): self.assertRedirects(res, '/edit/authors/create/') self.assertQuerysetEqual(Author.objects.all(), ['<Author: Randall Munroe>']) - @ignore_warnings(category=RemovedInDjango110Warning) def test_create_with_interpolated_redirect(self): res = self.client.post( '/edit/authors/create/interpolate_redirect/', @@ -292,7 +289,6 @@ class UpdateViewTests(TestCase): self.assertRedirects(res, '/edit/authors/create/') self.assertQuerysetEqual(Author.objects.all(), ['<Author: Randall Munroe (author of xkcd)>']) - @ignore_warnings(category=RemovedInDjango110Warning) def test_update_with_interpolated_redirect(self): a = Author.objects.create( name='Randall Munroe', @@ -399,7 +395,6 @@ class DeleteViewTests(TestCase): self.assertRedirects(res, '/edit/authors/create/') self.assertQuerysetEqual(Author.objects.all(), []) - @ignore_warnings(category=RemovedInDjango110Warning) def test_delete_with_interpolated_redirect(self): a = Author.objects.create(**{'name': 'Randall Munroe', 'slug': 'randall-munroe'}) res = self.client.post('/edit/author/%d/delete/interpolate_redirect/' % a.pk) diff --git a/tests/generic_views/urls.py b/tests/generic_views/urls.py index d455924a9e..365e23ff32 100644 --- a/tests/generic_views/urls.py +++ b/tests/generic_views/urls.py @@ -77,7 +77,7 @@ urlpatterns = [ url(r'^edit/authors/create/redirect/$', views.NaiveAuthorCreate.as_view(success_url='/edit/authors/create/')), url(r'^edit/authors/create/interpolate_redirect/$', - views.NaiveAuthorCreate.as_view(success_url='/edit/author/%(id)d/update/')), + views.NaiveAuthorCreate.as_view(success_url='/edit/author/{id}/update/')), url(r'^edit/authors/create/interpolate_redirect_nonascii/$', views.NaiveAuthorCreate.as_view(success_url='/%C3%A9dit/author/{id}/update/')), url(r'^edit/authors/create/restricted/$', @@ -92,7 +92,7 @@ urlpatterns = [ url(r'^edit/author/(?P<pk>[0-9]+)/update/redirect/$', views.NaiveAuthorUpdate.as_view(success_url='/edit/authors/create/')), url(r'^edit/author/(?P<pk>[0-9]+)/update/interpolate_redirect/$', - views.NaiveAuthorUpdate.as_view(success_url='/edit/author/%(id)d/update/')), + views.NaiveAuthorUpdate.as_view(success_url='/edit/author/{id}/update/')), url(r'^edit/author/(?P<pk>[0-9]+)/update/interpolate_redirect_nonascii/$', views.NaiveAuthorUpdate.as_view(success_url='/%C3%A9dit/author/{id}/update/')), url(r'^[eé]dit/author/(?P<pk>[0-9]+)/update/$', @@ -106,7 +106,7 @@ urlpatterns = [ url(r'^edit/author/(?P<pk>[0-9]+)/delete/redirect/$', views.NaiveAuthorDelete.as_view(success_url='/edit/authors/create/')), url(r'^edit/author/(?P<pk>[0-9]+)/delete/interpolate_redirect/$', - views.NaiveAuthorDelete.as_view(success_url='/edit/authors/create/?deleted=%(id)s')), + views.NaiveAuthorDelete.as_view(success_url='/edit/authors/create/?deleted={id}')), url(r'^edit/author/(?P<pk>[0-9]+)/delete/interpolate_redirect_nonascii/$', views.NaiveAuthorDelete.as_view(success_url='/%C3%A9dit/authors/create/?deleted={id}')), url(r'^edit/author/(?P<pk>[0-9]+)/delete/$', |