From 00da46091a0b35d4822b30e29334de4f4869901e Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Tue, 10 Feb 2015 08:41:45 -0500 Subject: Moved contrib.redirects tests out of contrib. --- django/contrib/redirects/tests.py | 85 --------------------------------------- tests/redirects_tests/__init__.py | 0 tests/redirects_tests/tests.py | 84 ++++++++++++++++++++++++++++++++++++++ tests/runtests.py | 2 + 4 files changed, 86 insertions(+), 85 deletions(-) delete mode 100644 django/contrib/redirects/tests.py create mode 100644 tests/redirects_tests/__init__.py create mode 100644 tests/redirects_tests/tests.py diff --git a/django/contrib/redirects/tests.py b/django/contrib/redirects/tests.py deleted file mode 100644 index 3bed0e02e5..0000000000 --- a/django/contrib/redirects/tests.py +++ /dev/null @@ -1,85 +0,0 @@ -from django import http -from django.conf import settings -from django.contrib.sites.models import Site -from django.core.exceptions import ImproperlyConfigured -from django.test import TestCase, modify_settings, override_settings -from django.utils import six - -from .middleware import RedirectFallbackMiddleware -from .models import Redirect - - -@modify_settings(MIDDLEWARE_CLASSES={'append': - 'django.contrib.redirects.middleware.RedirectFallbackMiddleware'}) -@override_settings(APPEND_SLASH=False, SITE_ID=1) -class RedirectTests(TestCase): - - def setUp(self): - 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') - 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') - 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) - - @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) - - 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') - self.assertEqual(response.status_code, 410) - - @modify_settings(INSTALLED_APPS={'remove': 'django.contrib.sites'}) - def test_sites_not_installed(self): - with self.assertRaises(ImproperlyConfigured): - RedirectFallbackMiddleware() - - -class OverriddenRedirectFallbackMiddleware(RedirectFallbackMiddleware): - # Use HTTP responses different from the defaults - response_gone_class = http.HttpResponseForbidden - response_redirect_class = http.HttpResponseRedirect - - -@modify_settings(MIDDLEWARE_CLASSES={'append': - 'django.contrib.redirects.tests.OverriddenRedirectFallbackMiddleware'}) -@override_settings(SITE_ID=1) -class OverriddenRedirectMiddlewareTests(TestCase): - - def setUp(self): - 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='') - 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/') - self.assertEqual(response.status_code, 302) diff --git a/tests/redirects_tests/__init__.py b/tests/redirects_tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/redirects_tests/tests.py b/tests/redirects_tests/tests.py new file mode 100644 index 0000000000..faa8cfe023 --- /dev/null +++ b/tests/redirects_tests/tests.py @@ -0,0 +1,84 @@ +from django import http +from django.conf import settings +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.test import TestCase, modify_settings, override_settings +from django.utils import six + + +@modify_settings(MIDDLEWARE_CLASSES={'append': + 'django.contrib.redirects.middleware.RedirectFallbackMiddleware'}) +@override_settings(APPEND_SLASH=False, SITE_ID=1) +class RedirectTests(TestCase): + + def setUp(self): + 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') + 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') + 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) + + @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) + + 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') + self.assertEqual(response.status_code, 410) + + @modify_settings(INSTALLED_APPS={'remove': 'django.contrib.sites'}) + def test_sites_not_installed(self): + with self.assertRaises(ImproperlyConfigured): + RedirectFallbackMiddleware() + + +class OverriddenRedirectFallbackMiddleware(RedirectFallbackMiddleware): + # Use HTTP responses different from the defaults + response_gone_class = http.HttpResponseForbidden + response_redirect_class = http.HttpResponseRedirect + + +@modify_settings(MIDDLEWARE_CLASSES={'append': + 'redirects_tests.tests.OverriddenRedirectFallbackMiddleware'}) +@override_settings(SITE_ID=1) +class OverriddenRedirectMiddlewareTests(TestCase): + + def setUp(self): + 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='') + 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/') + self.assertEqual(response.status_code, 302) diff --git a/tests/runtests.py b/tests/runtests.py index 1bb3c5699e..e8741ea56c 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -66,6 +66,7 @@ ALWAYS_MIDDLEWARE_CLASSES = [ # before its application was loaded." CONTRIB_TESTS_TO_APPS = { 'flatpages_tests': 'django.contrib.flatpages', + 'redirects_tests': 'django.contrib.redirects', } @@ -149,6 +150,7 @@ def setup(verbosity, test_labels): 'auth': 'django.contrib.auth.tests.migrations', 'contenttypes': 'django.contrib.contenttypes.tests.migrations', 'flatpages_tests': 'django.contrib.flatpages.migrations', + 'redirects_tests': 'django.contrib.redirects.migrations', } if verbosity > 0: -- cgit v1.3