fix tests

Author: rmorshea

docs/source/_custom_js/package-lock.json

@@ -29,6 +29,16 @@ Unreleased
   implementation specific and are now available as top-level imports. Instead of each
   backend defining these hooks, backends establish a ``ConnectionContext`` with this
   information.
+- :pull:`824` - IDOM's built-in backend server now expose the following routes:
+
+  - ``/_idom/assets/<file-path>``
+  - ``/_idom/stream/<path>``
+  - ``/_idom/modules/<file-path>``
+  - ``/<prefix>/<path>``
+
+  This should allow the browser to cache static resources. Even if your ``url_prefix``
+  is ``/_idom``, your app should still work as expected. Though if you're using
+  ``idom-router``, IDOM's server routes will always take priority.
 
 **Added**
 

docs/source/about/changelog.rst

@@ -3,6 +3,7 @@
 from contextlib import AsyncExitStack
 from types import TracebackType
 from typing import Any
+from urllib.parse import urljoin
 
 from playwright.async_api import (
     Browser,
@@ -27,6 +28,7 @@ def __init__(
         self,
         backend: BackendFixture | None = None,
         driver: Browser | BrowserContext | Page | None = None,
+        url_prefix: str = "",
     ) -> None:
         if backend is not None:
             self.backend = backend
@@ -35,6 +37,7 @@ def __init__(
                 self.page = driver
             else:
                 self._browser = driver
+        self.url_prefix = url_prefix
 
     async def show(
         self,
@@ -44,8 +47,14 @@ async def show(
         await self.goto("/")
         await self.root_element()  # check that root element is attached
 
-    async def goto(self, path: str, query: Any | None = None) -> None:
-        await self.page.goto(self.backend.url(path, query))
+    async def goto(
+        self, path: str, query: Any | None = None, add_url_prefix: bool = True
+    ) -> None:
+        await self.page.goto(
+            self.backend.url(
+                f"{self.url_prefix}{path}" if add_url_prefix else path, query
+            )
+        )
 
     async def root_element(self) -> ElementHandle:
         element = await self.page.wait_for_selector("#app", state="attached")

src/idom/testing/display.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from typing import MutableMapping
 
 import pytest
@@ -19,12 +19,21 @@
 )
 async def display(page, request):
     imp: BackendImplementation = request.param
-    async with BackendFixture(
-        implementation=imp,
-        # we do this to check that route priorities for each backend are correct
-        options=imp.Options(url_prefix=str(PATH_PREFIX)),
-    ) as server:
-        async with DisplayFixture(backend=server, driver=page) as display:
+
+    # we do this to check that route priorities for each backend are correct
+    if imp is default_implementation:
+        url_prefix = ""
+        opts = None
+    else:
+        url_prefix = str(PATH_PREFIX)
+        opts = imp.Options(url_prefix=url_prefix)
+
+    async with BackendFixture(implementation=imp, options=opts) as server:
+        async with DisplayFixture(
+            backend=server,
+            driver=page,
+            url_prefix=url_prefix,
+        ) as display:
             yield display
 
 
@@ -114,7 +123,7 @@ def ShowRoute():
 
     await display.show(ShowRoute)
 
-    await poll_location.until_equals(Location("/", ""))
+    await poll_location.until_equals(Location(display.url_prefix or "/", ""))
 
     for loc in [
         Location("/something"),
@@ -124,7 +133,8 @@ def ShowRoute():
         Location("/another/something/file.txt", "?key=value"),
         Location("/another/something/file.txt", "?key1=value1&key2=value2"),
     ]:
-        await display.goto(loc.pathname + loc.search)
+        loc = replace(loc, pathname=f"{display.url_prefix}{loc.pathname}")
+        await display.goto(loc.pathname + loc.search, add_url_prefix=False)
         await poll_location.until_equals(loc)