Fix a few coverage hits

Archmonger · Archmonger · commit a0584034a110 · 2025-01-30T16:41:51.000-08:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -117,7 +117,7 @@ xfail_strict = true
 asyncio_mode = "auto"
 log_cli_level = "INFO"
 
-[tool.hatch.envs.default.env-vars]
+[tool.hatch.envs.hatch-test.env-vars]
 REACTPY_DEBUG_MODE = "1"
 
 #######################################
@@ -234,7 +234,11 @@ warn_unused_ignores = true
 source_pkgs = ["reactpy"]
 branch = false
 parallel = false
-omit = ["reactpy/__init__.py"]
+omit = [
+  "src/reactpy/__init__.py",
+  "src/reactpy/_console/*",
+  "src/reactpy/__main__.py",
+]
 
 [tool.coverage.report]
 fail_under = 98
@@ -247,7 +251,6 @@ exclude_also = [
   "if __name__ == .__main__.:",
   "if TYPE_CHECKING:",
 ]
-omit = ["**/reactpy/__main__.py"]
 
 [tool.ruff]
 target-version = "py39"
diff --git a/src/reactpy/asgi/middleware.py b/src/reactpy/asgi/middleware.py
@@ -56,7 +56,7 @@ def __init__(
         self.web_modules_path = f"{self.path_prefix}modules/"
         self.static_path = f"{self.path_prefix}static/"
         self.dispatcher_pattern = re.compile(
-            f"^{self.dispatcher_path}(?P<dotted_path>[^/]+)/?"
+            f"^{self.dispatcher_path}(?P<dotted_path>[a-zA-Z0-9_.]+)/$"
         )
         self.js_modules_pattern = re.compile(f"^{self.web_modules_path}.*")
         self.static_pattern = re.compile(f"^{self.static_path}.*")
diff --git a/src/reactpy/asgi/standalone.py b/src/reactpy/asgi/standalone.py
@@ -47,6 +47,10 @@ def __init__(
         self.html_head = html_head or html.head()
         self.html_lang = html_lang
 
+    def match_dispatch_path(self, scope: asgi_types.WebSocketScope) -> bool:
+        """Method override to remove `dotted_path` from the dispatcher URL."""
+        return str(scope["path"]) == self.dispatcher_path
+
 
 @dataclass
 class ReactPyApp:
@@ -64,7 +68,7 @@ async def __call__(
         receive: asgi_types.ASGIReceiveCallable,
         send: asgi_types.ASGISendCallable,
     ) -> None:
-        if scope["type"] != "http":
+        if scope["type"] != "http":  # pragma: no cover
             if scope["type"] != "lifespan":
                 msg = (
                     "ReactPy app received unsupported request of type '%s' at path '%s'",
@@ -120,18 +124,13 @@ async def __call__(
             headers=dict_to_byte_list(response_headers),
         )
 
-    def match_dispatch_path(self, scope: asgi_types.WebSocketScope) -> bool:
-        """Method override to remove `dotted_path` from the dispatcher URL."""
-        return str(scope["path"]) == self.parent.dispatcher_path
-
     def process_index_html(self) -> None:
         """Process the index.html and store the results in memory."""
         self._cached_index_html = (
             "<!doctype html>"
             f'<html lang="{self.parent.html_lang}">'
             f"{vdom_head_to_html(self.parent.html_head)}"
             "<body>"
-            f'<div id="app"></div>'
             f"{render_mount_template('app', '', '')}"
             "</body>"
             "</html>"
diff --git a/src/reactpy/asgi/utils.py b/src/reactpy/asgi/utils.py
@@ -34,7 +34,7 @@ def import_components(dotted_paths: Iterable[str]) -> dict[str, Any]:
     }
 
 
-def check_path(url_path: str) -> str:
+def check_path(url_path: str) -> str:  # pragma: no cover
     """Check that a path is valid URL path."""
     if not url_path:
         return "URL path must not be empty."
diff --git a/src/reactpy/core/hooks.py b/src/reactpy/core/hooks.py
@@ -544,4 +544,4 @@ def strictly_equal(x: Any, y: Any) -> bool:
             return x == y  # type: ignore
 
     # Fallback to identity check
-    return x is y
+    return x is y  # pragma: no cover
diff --git a/src/reactpy/testing/utils.py b/src/reactpy/testing/utils.py
@@ -5,7 +5,9 @@
 from contextlib import closing
 
 
-def find_available_port(host: str, port_min: int = 8000, port_max: int = 9000) -> int:
+def find_available_port(
+    host: str, port_min: int = 8000, port_max: int = 9000
+) -> int:  # pragma: no cover
     """Get a port that's available for the given host and port range"""
     for port in range(port_min, port_max):
         with closing(socket.socket()) as sock:
diff --git a/tests/test_asgi/test_standalone.py b/tests/test_asgi/test_standalone.py
@@ -1,11 +1,13 @@
 from collections.abc import MutableMapping
 
 import pytest
+from requests import request
 
 import reactpy
 from reactpy import html
 from reactpy.asgi.standalone import ReactPy
 from reactpy.testing import BackendFixture, DisplayFixture, poll
+from reactpy.testing.common import REACTPY_TESTS_DEFAULT_TIMEOUT
 from reactpy.types import Connection, Location
 
 
@@ -138,3 +140,24 @@ def sample():
         async with DisplayFixture(backend=server, driver=page) as new_display:
             await new_display.show(sample)
             assert (await new_display.page.title()) == custom_title
+
+
+async def test_head_request(page):
+    @reactpy.component
+    def sample():
+        return html.h1("Hello World")
+
+    app = ReactPy(sample)
+
+    async with BackendFixture(app) as server:
+        async with DisplayFixture(backend=server, driver=page) as new_display:
+            await new_display.show(sample)
+            url = f"http://{server.host}:{server.port}"
+            response = request(
+                "HEAD", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+            )
+            assert response.status_code == 200
+            assert response.headers["content-type"] == "text/html; charset=utf-8"
+            assert response.headers["cache-control"] == "max-age=60, public"
+            assert response.headers["access-control-allow-origin"] == "*"
+            assert response.content == b""
diff --git a/tests/test_html.py b/tests/test_html.py
@@ -115,3 +115,27 @@ def test_simple_fragment():
 def test_fragment_can_have_no_attributes():
     with pytest.raises(TypeError, match="Fragments cannot have attributes"):
         html.fragment({"some_attribute": 1})
+
+
+async def test_svg(display: DisplayFixture):
+    @component
+    def SvgComponent():
+        return html.svg(
+            {"width": 100, "height": 100},
+            html.svg.circle(
+                {"cx": 50, "cy": 50, "r": 40, "fill": "red"},
+            ),
+            html.svg.circle(
+                {"cx": 50, "cy": 50, "r": 40, "fill": "red"},
+            ),
+        )
+
+    await display.show(SvgComponent)
+    svg = await display.page.wait_for_selector("svg", state="attached")
+    assert await svg.get_attribute("width") == "100"
+    assert await svg.get_attribute("height") == "100"
+    circle = await display.page.wait_for_selector("circle", state="attached")
+    assert await circle.get_attribute("cx") == "50"
+    assert await circle.get_attribute("cy") == "50"
+    assert await circle.get_attribute("r") == "40"
+    assert await circle.get_attribute("fill") == "red"

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ def __init__(`
`56`	`56`	`self.web_modules_path = f"{self.path_prefix}modules/"`
`57`	`57`	`self.static_path = f"{self.path_prefix}static/"`
`58`	`58`	`self.dispatcher_pattern = re.compile(`
`59`		`- f"^{self.dispatcher_path}(?P<dotted_path>[^/]+)/?"`
	`59`	`+ f"^{self.dispatcher_path}(?P<dotted_path>[a-zA-Z0-9_.]+)/$"`
`60`	`60`	`)`
`61`	`61`	`self.js_modules_pattern = re.compile(f"^{self.web_modules_path}.*")`
`62`	`62`	`self.static_pattern = re.compile(f"^{self.static_path}.*")`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ def import_components(dotted_paths: Iterable[str]) -> dict[str, Any]:`
`34`	`34`	`}`
`35`	`35`
`36`	`36`
`37`		`-def check_path(url_path: str) -> str:`
	`37`	`+def check_path(url_path: str) -> str: # pragma: no cover`
`38`	`38`	`"""Check that a path is valid URL path."""`
`39`	`39`	`if not url_path:`
`40`	`40`	`return "URL path must not be empty."`