Tests

readthedocs/api/v3/serializers.py

@@ -885,13 +885,13 @@ def validate_type(self, value):
         if value == "sphinx_html":
             raise serializers.ValidationError(
                 _(
-                    f"sphinx_html redirect has been renamed to clean_url_to_html. See {blog_link}"
+                    f"sphinx_html redirect has been renamed to clean_url_to_html. See {blog_link}."
                 )
             )
         if value == "sphinx_htmldir":
             raise serializers.ValidationError(
                 _(
-                    f"sphinx_htmldir redirect has been renamed to html_to_clean_url. See {blog_link}"
+                    f"sphinx_htmldir redirect has been renamed to html_to_clean_url. See {blog_link}."
                 )
             )
         return value

readthedocs/proxito/tests/test_old_redirects.py

@@ -198,6 +198,51 @@ def test_disabled_redirect(self):
         with self.assertRaises(Http404):
             self.client.get(url, headers={"host": "project.dev.readthedocs.io"})
 
+    def test_redirect_order(self):
+        redirect_a = fixture.get(
+            Redirect,
+            project=self.project,
+            redirect_type=EXACT_REDIRECT,
+            from_url="/en/latest/*",
+            to_url="/en/latest/tutorial/:splat",
+            enabled=True,
+        )
+        redirect_b = fixture.get(
+            Redirect,
+            project=self.project,
+            redirect_type=EXACT_REDIRECT,
+            from_url="/en/latest/install.html",
+            to_url="/en/latest/installation.html",
+            enabled=True,
+        )
+
+        redirect_a.refresh_from_db()
+        self.assertEqual(redirect_b.position, 0)
+        self.assertEqual(redirect_a.position, 1)
+
+        url = "/en/latest/install.html"
+        r = self.client.get(url, headers={"host": "project.dev.readthedocs.io"})
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(
+            r["Location"],
+            "http://project.dev.readthedocs.io/en/latest/installation.html",
+        )
+
+        redirect_a.position = 0
+        redirect_a.save()
+        redirect_b.refresh_from_db()
+
+        self.assertEqual(redirect_a.position, 0)
+        self.assertEqual(redirect_b.position, 1)
+
+        url = "/en/latest/install.html"
+        r = self.client.get(url, headers={"host": "project.dev.readthedocs.io"})
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(
+            r["Location"],
+            "http://project.dev.readthedocs.io/en/latest/tutorial/install.html",
+        )
+
     def test_redirect_ignored_on_external_domain(self):
         fixture.get(
             Redirect,

readthedocs/rtd_tests/tests/test_redirects.py

@@ -5,6 +5,7 @@
 from readthedocs.builds.constants import LATEST
 from readthedocs.projects.constants import SINGLE_VERSION_WITHOUT_TRANSLATIONS
 from readthedocs.projects.models import Project
+from readthedocs.redirects.constants import EXACT_REDIRECT
 from readthedocs.redirects.models import Redirect
 
 
@@ -37,6 +38,74 @@ def test_redirect_fragment(self):
         expected_path = "/en/latest/install.html#custom-fragment"
         self.assertEqual(path, expected_path)
 
+    def test_redirects_order(self):
+        self.pip.redirects.all().delete()
+        redirect_a = get(
+            Redirect,
+            project=self.pip,
+            from_url="/a/",
+            to_url="/z/",
+            redirect_type=EXACT_REDIRECT,
+        )
+        redirect_b = get(
+            Redirect,
+            project=self.pip,
+            from_url="/b/",
+            to_url="/z/",
+            redirect_type=EXACT_REDIRECT,
+        )
+        redirect_c = get(
+            Redirect,
+            project=self.pip,
+            from_url="/c/",
+            to_url="/z/",
+            redirect_type=EXACT_REDIRECT,
+        )
+
+        def _refresh():
+            redirect_a.refresh_from_db()
+            redirect_b.refresh_from_db()
+            redirect_c.refresh_from_db()
+
+        _refresh()
+        self.assertEqual(self.pip.redirects.count(), 3)
+        self.assertEqual(redirect_c.position, 0)
+        self.assertEqual(redirect_b.position, 1)
+        self.assertEqual(redirect_a.position, 2)
+
+        # Move redirect to the top
+        redirect_a.position = 0
+        redirect_a.save()
+
+        _refresh()
+
+        self.assertEqual(redirect_a.position, 0)
+        self.assertEqual(redirect_c.position, 1)
+        self.assertEqual(redirect_b.position, 2)
+
+        # Move redirect to the bottom
+        redirect_c.position = 5
+        redirect_c.save()
+
+        _refresh()
+        self.assertEqual(redirect_a.position, 0)
+        self.assertEqual(redirect_b.position, 1)
+        self.assertEqual(redirect_c.position, 2)
+
+        # Delete redirect
+        redirect_a.delete()
+
+        redirect_b.refresh_from_db()
+        redirect_c.refresh_from_db()
+        self.assertEqual(redirect_b.position, 0)
+        self.assertEqual(redirect_c.position, 1)
+
+        redirect_c.delete()
+        redirect_b.refresh_from_db()
+        self.assertEqual(redirect_b.position, 0)
+
+        redirect_b.delete()
+
 
 @override_settings(PUBLIC_DOMAIN="readthedocs.org")
 class RedirectBuildTests(TestCase):