Some pyscript component tests

Author: Archmonger

src/reactpy/pyscript/utils.py

@@ -134,7 +134,7 @@ def extend_pyscript_config(
     if extra_js and isinstance(extra_js, str):
         pyscript_config["js_modules"]["main"].update(json.loads(extra_js))
     elif extra_js and isinstance(extra_js, dict):
-        pyscript_config["js_modules"]["main"].update(extra_py)
+        pyscript_config["js_modules"]["main"].update(extra_js)
 
     # Update other config attributes
     if config and isinstance(config, str):

tests/test_asgi/test_pyscript.py

@@ -89,3 +89,8 @@ async def test_multi_file_components(multi_file_display: DisplayFixture):
 
     await multi_file_display.page.click("#incr")
     await multi_file_display.page.wait_for_selector("#incr[data-count='3']")
+
+
+def test_bad_file_path():
+    with pytest.raises(ValueError):
+        ReactPyPyscript()

tests/test_pyscript/__init__.py

@@ -0,0 +1,16 @@
+from reactpy import component, hooks, html
+
+
+@component
+def custom():
+    count, set_count = hooks.use_state(0)
+
+    def increment(event):
+        set_count(count + 1)
+
+    return html.div(
+        html.button(
+            {"onClick": increment, "id": "incr", "data-count": count}, "Increment"
+        ),
+        html.p(f"PyScript Count: {count}"),
+    )

tests/test_pyscript/pyscript_components/custom_root_name.py

@@ -0,0 +1,16 @@
+from reactpy import component, hooks, html
+
+
+@component
+def root():
+    count, set_count = hooks.use_state(0)
+
+    def increment(event):
+        set_count(count + 1)
+
+    return html.div(
+        html.button(
+            {"onClick": increment, "id": "incr", "data-count": count}, "Increment"
+        ),
+        html.p(f"PyScript Count: {count}"),
+    )

tests/test_pyscript/pyscript_components/root.py

@@ -0,0 +1,71 @@
+from pathlib import Path
+
+import pytest
+
+import reactpy
+from reactpy import html, pyscript_component
+from reactpy.executors.asgi import ReactPy
+from reactpy.testing import BackendFixture, DisplayFixture
+from reactpy.testing.backend import root_hotswap_component
+
+
+@pytest.fixture()
+async def display(page):
+    """Override for the display fixture that uses ReactPyMiddleware."""
+    app = ReactPy(root_hotswap_component, pyscript_setup=True)
+
+    async with BackendFixture(app) as server:
+        async with DisplayFixture(backend=server, driver=page) as new_display:
+            yield new_display
+
+
+async def test_pyscript_component(display: DisplayFixture):
+    @reactpy.component
+    def Counter():
+        return pyscript_component(
+            Path(__file__).parent / "pyscript_components" / "root.py",
+            initial=html.div({"id": "loading"}, "Loading..."),
+        )
+
+    await display.show(Counter)
+
+    await display.page.wait_for_selector("#loading")
+    await display.page.wait_for_selector("#incr")
+
+    await display.page.click("#incr")
+    await display.page.wait_for_selector("#incr[data-count='1']")
+
+    await display.page.click("#incr")
+    await display.page.wait_for_selector("#incr[data-count='2']")
+
+    await display.page.click("#incr")
+    await display.page.wait_for_selector("#incr[data-count='3']")
+
+
+async def test_custom_root_name(display: DisplayFixture):
+    @reactpy.component
+    def CustomRootName():
+        return pyscript_component(
+            Path(__file__).parent / "pyscript_components" / "custom_root_name.py",
+            initial=html.div({"id": "loading"}, "Loading..."),
+            root="custom",
+        )
+
+    await display.show(CustomRootName)
+
+    await display.page.wait_for_selector("#loading")
+    await display.page.wait_for_selector("#incr")
+
+    await display.page.click("#incr")
+    await display.page.wait_for_selector("#incr[data-count='1']")
+
+    await display.page.click("#incr")
+    await display.page.wait_for_selector("#incr[data-count='2']")
+
+    await display.page.click("#incr")
+    await display.page.wait_for_selector("#incr[data-count='3']")
+
+
+def test_bad_file_path():
+    with pytest.raises(ValueError):
+        pyscript_component(initial=html.div({"id": "loading"}, "Loading...")).render()

tests/test_pyscript/test_components.py

@@ -0,0 +1,59 @@
+from pathlib import Path
+from uuid import uuid4
+
+import orjson
+import pytest
+
+from reactpy.pyscript import utils
+
+
+def test_bad_root_name():
+    file_path = str(
+        Path(__file__).parent / "pyscript_components" / "custom_root_name.py"
+    )
+
+    with pytest.raises(ValueError):
+        utils.pyscript_executor_html((file_path,), uuid4().hex, "bad")
+
+
+def test_extend_pyscript_config():
+    extra_py = ["orjson", "tabulate"]
+    extra_js = {"/static/foo.js": "bar"}
+    config = {"packages_cache": "always"}
+
+    result = utils.extend_pyscript_config(extra_py, extra_js, config)
+    result = orjson.loads(result)
+
+    # Check whether `packages` have been combined
+    assert "orjson" in result["packages"]
+    assert "tabulate" in result["packages"]
+    assert any("reactpy" in package for package in result["packages"])
+
+    # Check whether `js_modules` have been combined
+    assert "/static/foo.js" in result["js_modules"]["main"]
+    assert any("morphdom" in module for module in result["js_modules"]["main"])
+
+    # Check whether `packages_cache` has been overridden
+    assert result["packages_cache"] == "always"
+
+
+def test_extend_pyscript_config_string_values():
+    extra_py = []
+    extra_js = {"/static/foo.js": "bar"}
+    config = {"packages_cache": "always"}
+
+    # Try using string based `extra_js` and `config`
+    extra_js_string = orjson.dumps(extra_js).decode()
+    config_string = orjson.dumps(config).decode()
+    result = utils.extend_pyscript_config(extra_py, extra_js_string, config_string)
+    result = orjson.loads(result)
+
+    # Make sure `packages` is unmangled
+    assert any("reactpy" in package for package in result["packages"])
+
+    # Check whether `js_modules` have been combined
+    assert "/static/foo.js" in result["js_modules"]["main"]
+    assert any("morphdom" in module for module in result["js_modules"]["main"])
+
+    # Check whether `packages_cache` has been overridden
+    assert result["packages_cache"] == "always"