More robust tests for router

Author: Archmonger

tests/test_app/router/components.py

@@ -1,46 +1,42 @@
 from reactpy import component, html, use_location
 from reactpy_router import route, use_params, use_search_params
+from reactpy_router.types import Route
 
 from reactpy_django.router import django_router
 
 
 @component
 def display_params(string: str):
     location = use_location()
-    query = use_search_params()
-    params = use_params()
+    search_params = use_search_params()
+    url_params = use_params()
 
     return html._(
         html.div({"id": "router-string"}, string),
-        html.div(f"Params: {params}"),
         html.div(
             {"id": "router-path", "data-path": location.pathname},
-            f"Path Name: {location.pathname}",
+            f"path: {location.pathname}",
         ),
-        html.div(f"Query String: {location.search}"),
-        html.div(f"Query: {query}"),
+        html.div(f"url_params: {url_params}"),
+        html.div(f"location.search: {location.search}"),
+        html.div(f"search_params: {search_params}"),
     )
 
 
+def show_route(path: str, *children: Route) -> Route:
+    return route(path, display_params(path), *children)
+
+
 @component
 def main():
     return django_router(
-        route("/router/", display_params("Path 1")),
-        route("/router/any/<value>/", display_params("Path 2")),
-        route("/router/integer/<int:value>/", display_params("Path 3")),
-        route("/router/path/<path:value>/", display_params("Path 4")),
-        route("/router/slug/<slug:value>/", display_params("Path 5")),
-        route("/router/string/<str:value>/", display_params("Path 6")),
-        route("/router/uuid/<uuid:value>/", display_params("Path 7")),
-        route("/router/", None, route("abc/", display_params("Path 8"))),
-        route(
-            "/router/two/<int:value>/<str:value2>/",
-            display_params("Path 9"),
-        ),
-        route(
-            "/router/<any:name1>/",
-            None,
-            route("one/", display_params("Path 11")),
-            route("<any:name2>", display_params("Path 12")),
-        ),
+        show_route("/router/", show_route("subroute/")),
+        show_route("/router/unspecified/<value>/"),
+        show_route("/router/integer/<int:value>/"),
+        show_route("/router/path/<path:value>/"),
+        show_route("/router/slug/<slug:value>/"),
+        show_route("/router/string/<str:value>/"),
+        show_route("/router/uuid/<uuid:value>/"),
+        show_route("/router/any/<any:name>"),
+        show_route("/router/two/<int:value>/<str:value2>/"),
     )

tests/test_app/tests/test_components.py

@@ -29,6 +29,8 @@ class ComponentTests(ChannelsLiveServerTestCase):
 
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
+
         # Repurposed from ChannelsLiveServerTestCase._pre_setup
         for connection in connections.all():
             if cls._is_in_memory_db(cls, connection):
@@ -77,14 +79,14 @@ def tearDownClass(cls):
         cls.playwright.stop()
 
         # Close the other server processes
+        cls._server_process.terminate()
+        cls._server_process.join()
         cls._server_process2.terminate()
         cls._server_process2.join()
         cls._server_process3.terminate()
         cls._server_process3.join()
 
         # Repurposed from ChannelsLiveServerTestCase._post_teardown
-        cls._server_process.terminate()
-        cls._server_process.join()
         cls._live_server_modified_settings.disable()
         for db_name in {"default", config.REACTPY_DATABASE}:
             call_command(
@@ -95,15 +97,15 @@ def tearDownClass(cls):
                 reset_sequences=False,
             )
 
+        super().tearDownClass()
+
     def _pre_setup(self):
         """Handled manually in `setUpClass` to speed things up."""
-        pass
 
     def _post_teardown(self):
         """Handled manually in `tearDownClass` to prevent TransactionTestCase from doing
         database flushing. This is needed to prevent a `SynchronousOnlyOperation` from
         occuring due to a bug within `ChannelsLiveServerTestCase`."""
-        pass
 
     def setUp(self):
         if self.page.url == "about:blank":
@@ -544,26 +546,44 @@ def test_url_router(self):
             new_page.goto(f"{self.live_server_url}/router/")
             path = new_page.wait_for_selector("#router-path")
             self.assertIn("/router/", path.get_attribute("data-path"))
+            string = new_page.query_selector("#router-string")
+            self.assertEqual("/router/", string.text_content())
+
+            new_page.goto(f"{self.live_server_url}/router/subroute/")
+            path = new_page.wait_for_selector("#router-path")
+            self.assertIn("/router/subroute/", path.get_attribute("data-path"))
+            string = new_page.query_selector("#router-string")
+            self.assertEqual("subroute/", string.text_content())
 
-            new_page.goto(f"{self.live_server_url}/router/any/123/")
+            new_page.goto(f"{self.live_server_url}/router/unspecified/123/")
             path = new_page.wait_for_selector("#router-path")
-            self.assertIn("/router/any/123/", path.get_attribute("data-path"))
+            self.assertIn("/router/unspecified/123/", path.get_attribute("data-path"))
+            string = new_page.query_selector("#router-string")
+            self.assertEqual("/router/unspecified/<value>/", string.text_content())
 
             new_page.goto(f"{self.live_server_url}/router/integer/123/")
             path = new_page.wait_for_selector("#router-path")
             self.assertIn("/router/integer/123/", path.get_attribute("data-path"))
+            string = new_page.query_selector("#router-string")
+            self.assertEqual("/router/integer/<int:value>/", string.text_content())
 
             new_page.goto(f"{self.live_server_url}/router/path/abc/123/")
             path = new_page.wait_for_selector("#router-path")
             self.assertIn("/router/path/abc/123/", path.get_attribute("data-path"))
+            string = new_page.query_selector("#router-string")
+            self.assertEqual("/router/path/<path:value>/", string.text_content())
 
             new_page.goto(f"{self.live_server_url}/router/slug/abc-123/")
             path = new_page.wait_for_selector("#router-path")
             self.assertIn("/router/slug/abc-123/", path.get_attribute("data-path"))
+            string = new_page.query_selector("#router-string")
+            self.assertEqual("/router/slug/<slug:value>/", string.text_content())
 
             new_page.goto(f"{self.live_server_url}/router/string/abc/")
             path = new_page.wait_for_selector("#router-path")
             self.assertIn("/router/string/abc/", path.get_attribute("data-path"))
+            string = new_page.query_selector("#router-string")
+            self.assertEqual("/router/string/<str:value>/", string.text_content())
 
             new_page.goto(
                 f"{self.live_server_url}/router/uuid/123e4567-e89b-12d3-a456-426614174000/"
@@ -573,18 +593,8 @@ def test_url_router(self):
                 "/router/uuid/123e4567-e89b-12d3-a456-426614174000/",
                 path.get_attribute("data-path"),
             )
-
-            new_page.goto(f"{self.live_server_url}/router/abc/")
-            path = new_page.wait_for_selector("#router-path")
-            self.assertIn("/router/abc/", path.get_attribute("data-path"))
-
-            new_page.goto(f"{self.live_server_url}/router/two/123/abc/")
-            path = new_page.wait_for_selector("#router-path")
-            self.assertIn("/router/two/123/abc/", path.get_attribute("data-path"))
-
-            new_page.goto(f"{self.live_server_url}/router/any/one/")
-            path = new_page.wait_for_selector("#router-path")
-            self.assertIn("/router/any/one/", path.get_attribute("data-path"))
+            string = new_page.query_selector("#router-string")
+            self.assertEqual("/router/uuid/<uuid:value>/", string.text_content())
 
             new_page.goto(
                 f"{self.live_server_url}/router/any/adslkjgklasdjhfah/6789543256/"
@@ -595,7 +605,15 @@ def test_url_router(self):
                 path.get_attribute("data-path"),
             )
             string = new_page.query_selector("#router-string")
-            self.assertEqual("Path 12", string.text_content())
+            self.assertEqual("/router/any/<any:name>", string.text_content())
+
+            new_page.goto(f"{self.live_server_url}/router/two/123/abc/")
+            path = new_page.wait_for_selector("#router-path")
+            self.assertIn("/router/two/123/abc/", path.get_attribute("data-path"))
+            string = new_page.query_selector("#router-string")
+            self.assertEqual(
+                "/router/two/<int:value>/<str:value2>/", string.text_content()
+            )
 
         finally:
             new_page.close()