fix old tests

Author: Archmonger

pyproject.toml

@@ -37,6 +37,7 @@ dependencies = [
   "asgiref >=3",
   "lxml >=4",
   "servestatic >=3.0.0",
+  "orjson >=3",
 ]
 dynamic = ["version"]
 urls.Changelog = "https://reactpy.dev/docs/about/changelog.html"
@@ -94,26 +95,28 @@ extra-dependencies = [
   "playwright",
   "jsonpointer",
   "uvicorn[standard]",
+  "jinja2-simple-tags",
+  "jinja2 >=3",
+  "starlette",
 ]
 
 [[tool.hatch.envs.hatch-test.matrix]]
 python = ["3.9", "3.10", "3.11", "3.12"]
 
 [tool.pytest.ini_options]
 addopts = """\
-    --strict-config
-    --strict-markers
-    """
+  --strict-config
+  --strict-markers
+"""
+filterwarnings = """
+  ignore::DeprecationWarning:uvicorn.*
+  ignore::DeprecationWarning:websockets.*
+"""
 testpaths = "tests"
 xfail_strict = true
 asyncio_mode = "auto"
 log_cli_level = "INFO"
 
-[tool.hatch.envs.default.scripts]
-test-cov = "playwright install && coverage run -m pytest {args:tests}"
-cov-report = ["coverage report"]
-cov = ["test-cov {args}", "cov-report"]
-
 [tool.hatch.envs.default.env-vars]
 REACTPY_DEBUG_MODE = "1"
 

src/js/packages/@reactpy/client/src/client.ts

@@ -78,6 +78,6 @@ export class ReactPyClient
   }
 
   loadModule(moduleName: string): Promise<ReactPyModule> {
-    return import(`${this.urls.jsModulesPath}/${moduleName}`);
+    return import(`${this.urls.jsModulesPath}${moduleName}`);
   }
 }

src/reactpy/asgi/standalone.py

@@ -1,11 +1,12 @@
+from __future__ import annotations
+
 import hashlib
 import re
 from collections.abc import Coroutine
 from dataclasses import dataclass
 from datetime import datetime
 from email.utils import formatdate
 from logging import getLogger
-from pathlib import Path
 from typing import Any, Callable
 
 from typing_extensions import Unpack

tests/conftest.py

@@ -20,14 +20,22 @@
 )
 
 REACTPY_ASYNC_RENDERING.current = True
+GITHUB_ACTIONS = os.getenv("GITHUB_ACTIONS", "False") in {
+    "y",
+    "yes",
+    "t",
+    "true",
+    "on",
+    "1",
+}
 
 
 def pytest_addoption(parser: Parser) -> None:
     parser.addoption(
-        "--headed",
-        dest="headed",
+        "--headless",
+        dest="headless",
         action="store_true",
-        help="Open a browser window when running web-based tests",
+        help="Don't open a browser window when running web-based tests",
     )
 
 
@@ -37,8 +45,8 @@ def install_playwright():
 
 
 @pytest.fixture(autouse=True, scope="session")
-def rebuild_javascript():
-    subprocess.run(["hatch", "run", "javascript:build"], check=True)  # noqa: S607, S603
+def rebuild():
+    subprocess.run(["hatch", "build", "-t", "wheel"], check=True)  # noqa: S607, S603
 
 
 @pytest.fixture
@@ -68,7 +76,9 @@ async def browser(pytestconfig: Config):
     from playwright.async_api import async_playwright
 
     async with async_playwright() as pw:
-        yield await pw.chromium.launch(headless=not bool(pytestconfig.option.headed))
+        yield await pw.chromium.launch(
+            headless=bool(pytestconfig.option.headless) or GITHUB_ACTIONS
+        )
 
 
 @pytest.fixture(scope="session")

tests/test_client.py

@@ -5,8 +5,8 @@
 from playwright.async_api import Browser
 
 import reactpy
-from reactpy.asgi.utils import find_available_port
 from reactpy.testing import BackendFixture, DisplayFixture, poll
+from reactpy.testing.utils import find_available_port
 from tests.tooling.common import DEFAULT_TYPE_DELAY
 from tests.tooling.hooks import use_counter
 

tests/test_html.py

@@ -46,7 +46,7 @@ def HasScript():
                 html.div({"id": "run-count", "data_value": 0}),
                 html.script(
                     {
-                        "src": f"/_reactpy/modules/{file_name_template.format(src_id=src_id)}"
+                        "src": f"/reactpy/modules/{file_name_template.format(src_id=src_id)}"
                     }
                 ),
             )

tests/test_testing.py

@@ -4,7 +4,6 @@
 import pytest
 
 from reactpy import Ref, component, html, testing
-from reactpy.asgi import starlette as starlette_implementation
 from reactpy.logging import ROOT_LOGGER
 from reactpy.testing.backend import _hotswap
 from reactpy.testing.display import DisplayFixture
@@ -144,19 +143,6 @@ async def test_simple_display_fixture():
         await display.page.wait_for_selector("#sample")
 
 
-def test_if_app_is_given_implementation_must_be_too():
-    with pytest.raises(
-        ValueError,
-        match=r"If an application instance its corresponding server implementation must be provided too",
-    ):
-        testing.BackendFixture(app=starlette_implementation.create_development_app())
-
-    testing.BackendFixture(
-        app=starlette_implementation.create_development_app(),
-        implementation=starlette_implementation,
-    )
-
-
 def test_list_logged_excptions():
     the_error = None
     with testing.capture_reactpy_logs() as records:

tests/test_web/test_module.py

@@ -1,10 +1,10 @@
 from pathlib import Path
 
 import pytest
-from sanic import Sanic
+from servestatic import ServeStaticASGI
 
 import reactpy
-from reactpy.asgi import sanic as sanic_implementation
+from reactpy.asgi.standalone import ReactPy
 from reactpy.testing import (
     BackendFixture,
     DisplayFixture,
@@ -50,27 +50,20 @@ def ShowCurrentComponent():
     await display.page.wait_for_selector("#unmount-flag", state="attached")
 
 
-@pytest.mark.flaky(reruns=3)
 async def test_module_from_url(browser):
-    app = Sanic("test_module_from_url")
-
-    # instead of directing the URL to a CDN, we just point it to this static file
-    app.static(
-        "/simple-button.js",
-        str(JS_FIXTURES_DIR / "simple-button.js"),
-        content_type="text/javascript",
-    )
-
     SimpleButton = reactpy.web.export(
-        reactpy.web.module_from_url("/simple-button.js", resolve_exports=False),
+        reactpy.web.module_from_url("/static/simple-button.js", resolve_exports=False),
         "SimpleButton",
     )
 
     @reactpy.component
     def ShowSimpleButton():
         return SimpleButton({"id": "my-button"})
 
-    async with BackendFixture(app=app, implementation=sanic_implementation) as server:
+    app = ReactPy(ShowSimpleButton)
+    app = ServeStaticASGI(app, JS_FIXTURES_DIR, "/static/")
+
+    async with BackendFixture(app) as server:
         async with DisplayFixture(server, browser) as display:
             await display.show(ShowSimpleButton)