summaryrefslogtreecommitdiff
path: root/tests/redirects_tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-04-07 22:04:45 -0400
committerTim Graham <timograham@gmail.com>2016-04-08 10:12:33 -0400
commit92053acbb9160862c3e743a99ed8ccff8d4f8fd6 (patch)
tree50e7fd28a650f0e2352cf94f92e5a66d28a81988 /tests/redirects_tests
parentdf8d8d4292684d6ffa7474f1e201aed486f02b53 (diff)
downloaddjango-92053acbb9160862c3e743a99ed8ccff8d4f8fd6.tar.gz
Fixed E128 flake8 warnings in tests/.
Diffstat (limited to 'tests/redirects_tests')
-rw-r--r--tests/redirects_tests/tests.py36
1 files changed, 12 insertions, 24 deletions
diff --git a/tests/redirects_tests/tests.py b/tests/redirects_tests/tests.py
index faa8cfe023..2d9793b0a5 100644
--- a/tests/redirects_tests/tests.py
+++ b/tests/redirects_tests/tests.py
@@ -8,8 +8,7 @@ from django.test import TestCase, modify_settings, override_settings
from django.utils import six
-@modify_settings(MIDDLEWARE_CLASSES={'append':
- 'django.contrib.redirects.middleware.RedirectFallbackMiddleware'})
+@modify_settings(MIDDLEWARE_CLASSES={'append': 'django.contrib.redirects.middleware.RedirectFallbackMiddleware'})
@override_settings(APPEND_SLASH=False, SITE_ID=1)
class RedirectTests(TestCase):
@@ -17,37 +16,29 @@ class RedirectTests(TestCase):
self.site = Site.objects.get(pk=settings.SITE_ID)
def test_model(self):
- r1 = Redirect.objects.create(
- site=self.site, old_path='/initial', new_path='/new_target')
+ r1 = Redirect.objects.create(site=self.site, old_path='/initial', new_path='/new_target')
self.assertEqual(six.text_type(r1), "/initial ---> /new_target")
def test_redirect(self):
- Redirect.objects.create(
- site=self.site, old_path='/initial', new_path='/new_target')
+ Redirect.objects.create(site=self.site, old_path='/initial', new_path='/new_target')
response = self.client.get('/initial')
- self.assertRedirects(response,
- '/new_target', status_code=301, target_status_code=404)
+ self.assertRedirects(response, '/new_target', status_code=301, target_status_code=404)
@override_settings(APPEND_SLASH=True)
def test_redirect_with_append_slash(self):
- Redirect.objects.create(
- site=self.site, old_path='/initial/', new_path='/new_target/')
+ Redirect.objects.create(site=self.site, old_path='/initial/', new_path='/new_target/')
response = self.client.get('/initial')
- self.assertRedirects(response,
- '/new_target/', status_code=301, target_status_code=404)
+ self.assertRedirects(response, '/new_target/', status_code=301, target_status_code=404)
@override_settings(APPEND_SLASH=True)
def test_redirect_with_append_slash_and_query_string(self):
- Redirect.objects.create(
- site=self.site, old_path='/initial/?foo', new_path='/new_target/')
+ Redirect.objects.create(site=self.site, old_path='/initial/?foo', new_path='/new_target/')
response = self.client.get('/initial?foo')
- self.assertRedirects(response,
- '/new_target/', status_code=301, target_status_code=404)
+ self.assertRedirects(response, '/new_target/', status_code=301, target_status_code=404)
def test_response_gone(self):
"""When the redirect target is '', return a 410"""
- Redirect.objects.create(
- site=self.site, old_path='/initial', new_path='')
+ Redirect.objects.create(site=self.site, old_path='/initial', new_path='')
response = self.client.get('/initial')
self.assertEqual(response.status_code, 410)
@@ -63,8 +54,7 @@ class OverriddenRedirectFallbackMiddleware(RedirectFallbackMiddleware):
response_redirect_class = http.HttpResponseRedirect
-@modify_settings(MIDDLEWARE_CLASSES={'append':
- 'redirects_tests.tests.OverriddenRedirectFallbackMiddleware'})
+@modify_settings(MIDDLEWARE_CLASSES={'append': 'redirects_tests.tests.OverriddenRedirectFallbackMiddleware'})
@override_settings(SITE_ID=1)
class OverriddenRedirectMiddlewareTests(TestCase):
@@ -72,13 +62,11 @@ class OverriddenRedirectMiddlewareTests(TestCase):
self.site = Site.objects.get(pk=settings.SITE_ID)
def test_response_gone_class(self):
- Redirect.objects.create(
- site=self.site, old_path='/initial/', new_path='')
+ Redirect.objects.create(site=self.site, old_path='/initial/', new_path='')
response = self.client.get('/initial/')
self.assertEqual(response.status_code, 403)
def test_response_redirect_class(self):
- Redirect.objects.create(
- site=self.site, old_path='/initial/', new_path='/new_target/')
+ Redirect.objects.create(site=self.site, old_path='/initial/', new_path='/new_target/')
response = self.client.get('/initial/')
self.assertEqual(response.status_code, 302)