1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Refs #33476 -- Reformatted code with Black.

This commit is contained in:
django-bot
2022-02-03 20:24:19 +01:00
committed by Mariusz Felisiak
parent f68fa8b45d
commit 9c19aff7c7
1992 changed files with 139577 additions and 96284 deletions

View File

@@ -3,40 +3,55 @@ from django.contrib.redirects.middleware import RedirectFallbackMiddleware
from django.contrib.redirects.models import Redirect
from django.contrib.sites.models import Site
from django.core.exceptions import ImproperlyConfigured
from django.http import (
HttpResponse, HttpResponseForbidden, HttpResponseRedirect,
)
from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect
from django.test import TestCase, modify_settings, override_settings
@modify_settings(MIDDLEWARE={'append': 'django.contrib.redirects.middleware.RedirectFallbackMiddleware'})
@override_settings(APPEND_SLASH=False, ROOT_URLCONF='redirects_tests.urls', SITE_ID=1)
@modify_settings(
MIDDLEWARE={
"append": "django.contrib.redirects.middleware.RedirectFallbackMiddleware"
}
)
@override_settings(APPEND_SLASH=False, ROOT_URLCONF="redirects_tests.urls", SITE_ID=1)
class RedirectTests(TestCase):
@classmethod
def setUpTestData(cls):
cls.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(str(r1), "/initial ---> /new_target")
def test_redirect(self):
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)
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
)
@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/')
response = self.client.get('/initial')
self.assertRedirects(response, '/new_target/', status_code=301, target_status_code=404)
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
)
@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/')
response = self.client.get('/initial?foo')
self.assertRedirects(response, '/new_target/', status_code=301, target_status_code=404)
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
)
@override_settings(APPEND_SLASH=True)
def test_redirect_not_found_with_append_slash(self):
@@ -44,28 +59,28 @@ class RedirectTests(TestCase):
Exercise the second Redirect.DoesNotExist branch in
RedirectFallbackMiddleware.
"""
response = self.client.get('/test')
response = self.client.get("/test")
self.assertEqual(response.status_code, 404)
def test_redirect_shortcircuits_non_404_response(self):
"""RedirectFallbackMiddleware short-circuits on non-404 requests."""
response = self.client.get('/')
response = self.client.get("/")
self.assertEqual(response.status_code, 200)
def test_response_gone(self):
"""When the redirect target is '', return a 410"""
Redirect.objects.create(site=self.site, old_path='/initial', new_path='')
response = self.client.get('/initial')
Redirect.objects.create(site=self.site, old_path="/initial", new_path="")
response = self.client.get("/initial")
self.assertEqual(response.status_code, 410)
@modify_settings(INSTALLED_APPS={'remove': 'django.contrib.sites'})
@modify_settings(INSTALLED_APPS={"remove": "django.contrib.sites"})
def test_sites_not_installed(self):
def get_response(request):
return HttpResponse()
msg = (
'You cannot use RedirectFallbackMiddleware when '
'django.contrib.sites is not installed.'
"You cannot use RedirectFallbackMiddleware when "
"django.contrib.sites is not installed."
)
with self.assertRaisesMessage(ImproperlyConfigured, msg):
RedirectFallbackMiddleware(get_response)
@@ -77,20 +92,23 @@ class OverriddenRedirectFallbackMiddleware(RedirectFallbackMiddleware):
response_redirect_class = HttpResponseRedirect
@modify_settings(MIDDLEWARE={'append': 'redirects_tests.tests.OverriddenRedirectFallbackMiddleware'})
@modify_settings(
MIDDLEWARE={"append": "redirects_tests.tests.OverriddenRedirectFallbackMiddleware"}
)
@override_settings(SITE_ID=1)
class OverriddenRedirectMiddlewareTests(TestCase):
@classmethod
def setUpTestData(cls):
cls.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='')
response = self.client.get('/initial/')
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/')
response = self.client.get('/initial/')
Redirect.objects.create(
site=self.site, old_path="/initial/", new_path="/new_target/"
)
response = self.client.get("/initial/")
self.assertEqual(response.status_code, 302)

View File

@@ -2,5 +2,5 @@ from django.http import HttpResponse
from django.urls import path
urlpatterns = [
path('', lambda req: HttpResponse('OK')),
path("", lambda req: HttpResponse("OK")),
]