Fix tests and simplify logic

Author: ericholscher

readthedocs/proxito/tests/test_urls.py

@@ -17,6 +17,7 @@ def test_root(self):
         self.assertEqual(
             match.kwargs, {
                 'subproject_slug': None,
+                'subproject_slash': None,
                 'filename': '',
             },
         )
@@ -80,6 +81,7 @@ def test_subproject_single_version(self):
         self.assertEqual(
             match.kwargs, {
                 'subproject_slug': 'bar',
+                'subproject_slash': '/',
                 'filename': 'index.html',
             },
         )
@@ -91,6 +93,7 @@ def test_subproject_root(self):
         self.assertEqual(
             match.kwargs, {
                 'subproject_slug': 'bar',
+                'subproject_slash': '/',
                 'filename': '',
             },
         )
@@ -101,6 +104,7 @@ def test_single_version(self):
         self.assertEqual(match.args, ())
         self.assertEqual(
             match.kwargs, {
+                'subproject_slash': None,
                 'subproject_slug': None,
                 'filename': 'some/path/index.html',
             },

readthedocs/proxito/views/serve.py

@@ -89,15 +89,8 @@ def get(self,
                 # because it is taken from the host name
                 version_slug is None or hasattr(request, 'external_domain'),
                 filename == '',
-                not final_project.single_version,
-        ]):
-            return self.system_redirect(request, final_project, lang_slug, version_slug, filename)
-
-        # Handle `/projects/subproject` URL redirection
-        if all([
-                final_project.single_version,
-                filename == '',
-                not subproject_slash,
+                # Handle `/projects/subproject` and `/projects/subproject/` URL redirects
+                not final_project.single_version or not subproject_slash,
         ]):
             return self.system_redirect(request, final_project, lang_slug, version_slug, filename)