[1.1.X] Fixed #6228: Changed common middleware to respect request-specific urlconf. Thanks trey, skevy, and mikexstudios.

r12704 and r12705 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12706 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 128 insertions, 0 deletions

diff --git a/tests/regressiontests/middleware/extra_urls.py b/tests/regressiontests/middleware/extra_urls.py
new file mode 100644
index 0000000000..b2a89023d5
--- /dev/null
+++ b/tests/regressiontests/middleware/extra_urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls.defaults import patterns
+
+urlpatterns = patterns('',
+    (r'^middleware/customurlconf/noslash$', 'view'),
+    (r'^middleware/customurlconf/slash/$', 'view'),
+    (r'^middleware/customurlconf/needsquoting#/$', 'view'),
+)
diff --git a/tests/regressiontests/middleware/tests.py b/tests/regressiontests/middleware/tests.py
index b7e830ac23..fac15c15bc 100644
--- a/tests/regressiontests/middleware/tests.py
+++ b/tests/regressiontests/middleware/tests.py
@@ -125,3 +125,124 @@ class CommonMiddlewareTest(TestCase):
         self.assertEquals(r.status_code, 301)
         self.assertEquals(r['Location'],
                           'http://www.testserver/middleware/slash/')
+   
+
+    # The following tests examine expected behavior given a custom urlconf that
+    # overrides the default one through the request object.
+
+    def test_append_slash_have_slash_custom_urlconf(self):
+      """
+      Tests that URLs with slashes go unmolested.
+      """
+      settings.APPEND_SLASH = True
+      request = self._get_request('customurlconf/slash/')
+      request.urlconf = 'regressiontests.middleware.extra_urls'
+      self.assertEquals(CommonMiddleware().process_request(request), None)
+
+    def test_append_slash_slashless_resource_custom_urlconf(self):
+      """
+      Tests that matches to explicit slashless URLs go unmolested.
+      """
+      settings.APPEND_SLASH = True
+      request = self._get_request('customurlconf/noslash')
+      request.urlconf = 'regressiontests.middleware.extra_urls'
+      self.assertEquals(CommonMiddleware().process_request(request), None)
+
+    def test_append_slash_slashless_unknown_custom_urlconf(self):
+      """
+      Tests that APPEND_SLASH doesn't redirect to unknown resources.
+      """
+      settings.APPEND_SLASH = True
+      request = self._get_request('customurlconf/unknown')
+      request.urlconf = 'regressiontests.middleware.extra_urls'
+      self.assertEquals(CommonMiddleware().process_request(request), None)
+
+    def test_append_slash_redirect_custom_urlconf(self):
+      """
+      Tests that APPEND_SLASH redirects slashless URLs to a valid pattern.
+      """
+      settings.APPEND_SLASH = True
+      request = self._get_request('customurlconf/slash')
+      request.urlconf = 'regressiontests.middleware.extra_urls'
+      r = CommonMiddleware().process_request(request)
+      self.failIf(r is None, 
+          "CommonMiddlware failed to return APPEND_SLASH redirect using request.urlconf")
+      self.assertEquals(r.status_code, 301)
+      self.assertEquals(r['Location'], 'http://testserver/middleware/customurlconf/slash/')
+
+    def test_append_slash_no_redirect_on_POST_in_DEBUG_custom_urlconf(self):
+      """
+      Tests that while in debug mode, an exception is raised with a warning
+      when a failed attempt is made to POST to an URL which would normally be
+      redirected to a slashed version.
+      """
+      settings.APPEND_SLASH = True
+      settings.DEBUG = True
+      request = self._get_request('customurlconf/slash')
+      request.urlconf = 'regressiontests.middleware.extra_urls'
+      request.method = 'POST'
+      self.assertRaises(
+          RuntimeError,
+          CommonMiddleware().process_request,
+          request)
+      try:
+          CommonMiddleware().process_request(request)
+      except RuntimeError, e:
+          self.failUnless('end in a slash' in str(e))
+      settings.DEBUG = False
+
+    def test_append_slash_disabled_custom_urlconf(self):
+      """
+      Tests disabling append slash functionality.
+      """
+      settings.APPEND_SLASH = False
+      request = self._get_request('customurlconf/slash')
+      request.urlconf = 'regressiontests.middleware.extra_urls'
+      self.assertEquals(CommonMiddleware().process_request(request), None)
+
+    def test_append_slash_quoted_custom_urlconf(self):
+      """
+      Tests that URLs which require quoting are redirected to their slash
+      version ok.
+      """
+      settings.APPEND_SLASH = True
+      request = self._get_request('customurlconf/needsquoting#')
+      request.urlconf = 'regressiontests.middleware.extra_urls'
+      r = CommonMiddleware().process_request(request)
+      self.failIf(r is None, 
+          "CommonMiddlware failed to return APPEND_SLASH redirect using request.urlconf")
+      self.assertEquals(r.status_code, 301)
+      self.assertEquals(
+          r['Location'],
+          'http://testserver/middleware/customurlconf/needsquoting%23/')
+
+    def test_prepend_www_custom_urlconf(self):
+      settings.PREPEND_WWW = True
+      settings.APPEND_SLASH = False
+      request = self._get_request('customurlconf/path/')
+      request.urlconf = 'regressiontests.middleware.extra_urls'
+      r = CommonMiddleware().process_request(request)
+      self.assertEquals(r.status_code, 301)
+      self.assertEquals(
+          r['Location'],
+          'http://www.testserver/middleware/customurlconf/path/')
+
+    def test_prepend_www_append_slash_have_slash_custom_urlconf(self):
+      settings.PREPEND_WWW = True
+      settings.APPEND_SLASH = True
+      request = self._get_request('customurlconf/slash/')
+      request.urlconf = 'regressiontests.middleware.extra_urls'
+      r = CommonMiddleware().process_request(request)
+      self.assertEquals(r.status_code, 301)
+      self.assertEquals(r['Location'],
+                        'http://www.testserver/middleware/customurlconf/slash/')
+
+    def test_prepend_www_append_slash_slashless_custom_urlconf(self):
+      settings.PREPEND_WWW = True
+      settings.APPEND_SLASH = True
+      request = self._get_request('customurlconf/slash')
+      request.urlconf = 'regressiontests.middleware.extra_urls'
+      r = CommonMiddleware().process_request(request)
+      self.assertEquals(r.status_code, 301)
+      self.assertEquals(r['Location'],
+                        'http://www.testserver/middleware/customurlconf/slash/')