summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorieatkittens <samuelm@gadventures.com>2016-03-18 15:21:41 -0400
committerTim Graham <timograham@gmail.com>2016-03-23 09:29:37 -0400
commitccc367fd48655b8709a01653b224e5ffa19c9dee (patch)
treee1ddce54bc1503bc3f7dc4f139af064e5c98ff53 /tests
parent7dee62ff6833c1dbbf013b7f264f24226612a81b (diff)
[1.9.x] Fixed #26293 -- Fixed CommonMiddleware to process PREPEND_WWW and APPEND_SLASH independently.
Backport of 9390da7fb6e251eaa9a785692f987296cb14523f from master
Diffstat (limited to 'tests')
-rw-r--r--tests/middleware/tests.py7
1 files changed, 1 insertions, 6 deletions
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):