Use reverse(query=) to build URLs with query strings

isic/core/tests/test_collection_list_browser.py

@@ -13,12 +13,6 @@ def _refresh_collection_counts():
         cursor.execute("REFRESH MATERIALIZED VIEW materialized_collection_counts;")
 
 
-def _build_url(**params):
-    base = reverse("core/collection-list")
-    qs = "&".join(f"{k}={v}" for k, v in params.items())
-    return f"{base}?{qs}"
-
-
 @pytest.mark.playwright
 def test_collection_list_desktop(
     staff_authenticated_page,
@@ -58,7 +52,9 @@ def test_collection_list_desktop(
         related_identifier="https://example.com/paper",
     )
 
-    page.goto(_build_url(exclude_empty=0, magic_filter="exclude"))
+    page.goto(
+        reverse("core/collection-list", query={"exclude_empty": 0, "magic_filter": "exclude"})
+    )
 
     # All four column headers are visible on desktop
     expect(page.get_by_role("columnheader", name="Created")).to_be_visible()
@@ -138,7 +134,9 @@ def test_collection_list_mobile(
     ctx.add_cookies([{"name": "sessionid", "value": session_cookie.value, "url": live_server.url}])
     page = ctx.new_page()
 
-    page.goto(_build_url(exclude_empty=0, magic_filter="exclude"))
+    page.goto(
+        reverse("core/collection-list", query={"exclude_empty": 0, "magic_filter": "exclude"})
+    )
 
     # Name column is visible on mobile
     expect(page.get_by_role("columnheader", name="Name")).to_be_visible()

isic/core/tests/test_data_explorer_browser.py

@@ -1,7 +1,6 @@
 from datetime import UTC, datetime
 from pathlib import Path
 import tempfile
-from urllib.parse import quote
 
 from django.core.files.storage import storages
 from django.urls import reverse
@@ -125,7 +124,7 @@ def test_data_explorer_example_query(page, data_explorer_parquet):
 def test_data_explorer_query_sharing_via_link(page, data_explorer_parquet):
     query = "SELECT sex, COUNT(*) AS count FROM metadata GROUP BY sex ORDER BY count DESC"
     page.goto(
-        f"{reverse('core/data-explorer')}?q={quote(query)}",
+        reverse("core/data-explorer", query={"q": query}),
         timeout=30_000,
     )
     _wait_for_ready(page)

isic/core/tests/test_permissions.py

@@ -58,7 +58,7 @@ def test_core_collection_create(client_, visible):
 
 @pytest.mark.django_db
 def test_core_collection_list(client, authenticated_client, staff_client, private_collection):
-    url = reverse("core/collection-list") + "?exclude_empty=0&magic_filter=all"
+    url = reverse("core/collection-list", query={"exclude_empty": "0", "magic_filter": "all"})
 
     r = client.get(url)
     assert list(r.context["page"].object_list) == []
@@ -86,7 +86,7 @@ def test_core_collection_detail(client, authenticated_client, staff_client, priv
 def test_core_collection_list_shares(
     user, client, authenticated_client, staff_client, private_collection
 ):
-    url = reverse("core/collection-list") + "?exclude_empty=0&magic_filter=all"
+    url = reverse("core/collection-list", query={"exclude_empty": "0", "magic_filter": "all"})
     private_collection.shares.add(user, through_defaults={"grantor": private_collection.creator})
 
     r = client.get(url)