redirect: Make the trailing slash optional

Author: tdgroot

hypernode/redirect/generate_nginx_redirects.py

@@ -27,5 +27,6 @@ def get_path_for_doc(doc: Path) -> str:
 def main():
     for doc in get_all_docs():
         for redirect in get_redirects_from_doc(doc):
+            redirect = redirect.rstrip("/")
             doc_path = get_path_for_doc(doc)
-            print("rewrite ^{}$ {} permanent;".format(redirect, doc_path))
+            print("rewrite ^{}/?$ {} permanent;".format(redirect, doc_path))

tests/redirect/test_generate_nginx_redirects.py

@@ -1,5 +1,6 @@
 import os
 from pathlib import Path
+from unittest.mock import call
 
 from hypernode.common.settings import DOCS_DIR
 from hypernode.redirect.generate_nginx_redirects import (
@@ -18,16 +19,19 @@ def setUp(self) -> None:
             module + "get_all_docs", return_value=[DOCS_DIR / "index.html"]
         )
         self.get_redirects_from_doc = self.set_up_patch(
-            module + "get_redirects_from_doc", return_value=["/old-url/"]
+            module + "get_redirects_from_doc",
+            return_value=["/old-url/", "/en/another-url"],
         )
 
     def test_main_prints_rewrites(self):
         main()
 
-        expected_output = """
-rewrite ^/old-url/$ / permanent;
-        """.strip()
-        self.print.assert_called_once_with(expected_output)
+        self.print.assert_has_calls(
+            [
+                call("rewrite ^/old-url/?$ / permanent;"),
+                call("rewrite ^/en/another-url/?$ / permanent;"),
+            ]
+        )
 
 
 class TestGetPathForDoc(HypernodeTestCase):