From ccc367fd48655b8709a01653b224e5ffa19c9dee Mon Sep 17 00:00:00 2001 From: ieatkittens Date: Fri, 18 Mar 2016 15:21:41 -0400 Subject: [1.9.x] Fixed #26293 -- Fixed CommonMiddleware to process PREPEND_WWW and APPEND_SLASH independently. Backport of 9390da7fb6e251eaa9a785692f987296cb14523f from master --- tests/middleware/tests.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py index bf96f05048..2452470b81 100644 --- a/tests/middleware/tests.py +++ b/tests/middleware/tests.py @@ -67,10 +67,8 @@ class CommonMiddlewareTest(SimpleTestCase): APPEND_SLASH should redirect slashless URLs to a valid pattern. """ request = self.rf.get('/slash') - response = HttpResponseNotFound() - r = CommonMiddleware().process_response(request, response) + r = CommonMiddleware().process_request(request) self.assertEqual(r.status_code, 301) - self.assertEqual(r.url, '/slash/') @override_settings(APPEND_SLASH=True) def test_append_slash_redirect_querystring(self): @@ -301,9 +299,6 @@ class CommonMiddlewareTest(SimpleTestCase): request = self.rf.get('/slash') request.META['QUERY_STRING'] = force_str('drink=café') r = CommonMiddleware().process_request(request) - self.assertIsNone(r) - response = HttpResponseNotFound() - r = CommonMiddleware().process_response(request, response) self.assertEqual(r.status_code, 301) def test_response_redirect_class(self): -- cgit v1.3