clean up and add tests

Author: JamesHutchison

src/reactpy/executors/asgi/pyscript.py

@@ -32,7 +32,7 @@ def __init__(
         initial: str | VdomDict = "",
         http_headers: dict[str, str] | None = None,
         html_head: VdomDict | None = None,
-        html_noscript_path: str | Path | None = None,
+        html_noscript_str_or_path: str | Path | None = "Enable JavaScript to view this site.",
         html_lang: str = "en",
         **settings: Unpack[ReactPyConfig],
     ) -> None:
@@ -60,8 +60,8 @@ def __init__(
                 commonly used to render a loading animation.
             http_headers: Additional headers to include in the HTTP response for the base HTML document.
             html_head: Additional head elements to include in the HTML response.
-            html_noscript_path: Path to an HTML file whose contents are rendered within a
-                `<noscript>` tag in the HTML body.
+            html_noscript_str_or_path: String or Path to an HTML file whose contents are rendered within a
+                `<noscript>` tag in the HTML body. If None, then noscript is not rendered.
             html_lang: The language of the HTML document.
             settings:
                 Global ReactPy configuration settings that affect behavior and performance. Most settings
@@ -81,7 +81,7 @@ def __init__(
         self.extra_headers = http_headers or {}
         self.dispatcher_pattern = re.compile(f"^{self.dispatcher_path}?")
         self.html_head = html_head or html.head()
-        self.html_noscript_path = html_noscript_path
+        self.html_noscript_str_or_path = html_noscript_str_or_path
         self.html_lang = html_lang
 
     def match_dispatch_path(self, scope: AsgiWebsocketScope) -> bool:  # nocov
@@ -101,7 +101,7 @@ class ReactPyPyscriptApp(ReactPyApp):
     def render_index_html(self) -> None:
         """Process the index.html and store the results in this class."""
         head_content = vdom_head_to_html(self.parent.html_head)
-        noscript = html_noscript_path_to_html(self.parent.html_noscript_path or "")
+        noscript = html_noscript_path_to_html(self.parent.html_noscript_str_or_path)
         pyscript_setup = pyscript_setup_html(
             extra_py=self.parent.extra_py,
             extra_js=self.parent.extra_js,

src/reactpy/executors/asgi/standalone.py

@@ -50,7 +50,7 @@ def __init__(
         *,
         http_headers: dict[str, str] | None = None,
         html_head: VdomDict | None = None,
-        html_noscript_path: str | Path | None = None,
+        html_noscript_str_or_path: str | Path | None = "Enable JavaScript to view this site.",
         html_lang: str = "en",
         pyscript_setup: bool = False,
         pyscript_options: PyScriptOptions | None = None,
@@ -62,7 +62,7 @@ def __init__(
             root_component: The root component to render. This app is typically a single page application.
             http_headers: Additional headers to include in the HTTP response for the base HTML document.
             html_head: Additional head elements to include in the HTML response.
-            html_noscript_path: Path to an HTML file whose contents are rendered within a
+            html_noscript_str_or_path: String or Path to an HTML file whose contents are rendered within a
                 `<noscript>` tag in the HTML body.
             html_lang: The language of the HTML document.
             pyscript_setup: Whether to automatically load PyScript within your HTML head.
@@ -74,7 +74,7 @@ def __init__(
         self.extra_headers = http_headers or {}
         self.dispatcher_pattern = re.compile(f"^{self.dispatcher_path}?")
         self.html_head = html_head or html.head()
-        self.html_noscript_path = html_noscript_path
+        self.html_noscript_str_or_path = html_noscript_str_or_path
         self.html_lang = html_lang
 
         if pyscript_setup:
@@ -238,7 +238,7 @@ async def __call__(
 
     def render_index_html(self) -> None:
         """Process the index.html and store the results in this class."""
-        noscript = html_noscript_path_to_html(self.parent.html_noscript_path)
+        noscript = html_noscript_path_to_html(self.parent.html_noscript_str_or_path)
         self._index_html = (
             "<!doctype html>"
             f'<html lang="{self.parent.html_lang}">'

src/reactpy/executors/utils.py

@@ -47,10 +47,12 @@ def vdom_head_to_html(head: VdomDict) -> str:
     raise ValueError("Head element must be constructed with `html.head`.")
 
 
-def html_noscript_path_to_html(path: str | Path | None = "", default_text="Please enable JavaScript to view this site.") -> str:
-    if path:
-        return f"<noscript>{Path(path).read_text(encoding='utf-8')}</noscript>"
-    return f"<noscript>{default_text}</noscript>"
+def html_noscript_path_to_html(path_or_body: str | Path | None) -> str:
+    if path_or_body is None:
+        return ""
+    if isinstance(path_or_body, Path):
+        return f"<noscript>{path_or_body.read_text()}</noscript>"
+    return f"<noscript>{path_or_body}</noscript>"
 
 
 def process_settings(settings: ReactPyConfig) -> None:

tests/test_asgi/test_pyscript.py

@@ -3,13 +3,14 @@
 from pathlib import Path
 
 import pytest
-from requests import request
 from jinja2 import Environment as JinjaEnvironment
 from jinja2 import FileSystemLoader as JinjaFileSystemLoader
+from requests import request
 from starlette.applications import Starlette
 from starlette.routing import Route
 from starlette.templating import Jinja2Templates
 
+import reactpy
 from reactpy import html
 from reactpy.executors.asgi.pyscript import ReactPyCsr
 from reactpy.testing import BackendFixture, DisplayFixture
@@ -110,7 +111,68 @@ async def test_customized_noscript(tmp_path: Path):
 
     app = ReactPyCsr(
         Path(__file__).parent / "pyscript_components" / "root.py",
-        html_noscript_path=noscript_file,
+        html_noscript_str_or_path=noscript_file,
+    )
+
+    async with BackendFixture(app) as server:
+        url = f"http://{server.host}:{server.port}"
+        response = await asyncio.to_thread(
+            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+        )
+        assert response.status_code == 200
+        assert (
+            '<noscript><p id="noscript-message">Please enable JavaScript.</p></noscript>'
+            in response.text
+        )
+
+
+
+async def test_customized_noscript_string():
+    app = ReactPyCsr(
+        Path(__file__).parent / "pyscript_components" / "root.py",
+        html_noscript_str_or_path='<p id="noscript-message">Please enable JavaScript.</p>',
+    )
+
+    async with BackendFixture(app) as server:
+        url = f"http://{server.host}:{server.port}"
+        response = await asyncio.to_thread(
+            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+        )
+        assert response.status_code == 200
+        assert (
+            '<noscript><p id="noscript-message">Please enable JavaScript.</p></noscript>'
+            in response.text
+        )
+
+
+async def test_customized_noscript_from_file(tmp_path: Path):
+    noscript_file = tmp_path / "noscript.html"
+    noscript_file.write_text(
+        '<p id="noscript-message">Please enable JavaScript.</p>',
+        encoding="utf-8",
+    )
+
+    app = ReactPyCsr(
+        Path(__file__).parent / "pyscript_components" / "root.py",
+        html_noscript_str_or_path=noscript_file,
+    )
+
+    async with BackendFixture(app) as server:
+        url = f"http://{server.host}:{server.port}"
+        response = await asyncio.to_thread(
+            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+        )
+        assert response.status_code == 200
+        assert (
+            '<noscript><p id="noscript-message">Please enable JavaScript.</p></noscript>'
+            in response.text
+        )
+
+
+async def test_customized_noscript_from_string():
+    app = ReactPyCsr(
+        Path(__file__).parent / "pyscript_components" / "root.py",
+        html_noscript_str_or_path='<p id="noscript-message">Please enable JavaScript.</p>',
     )
 
     async with BackendFixture(app) as server:
@@ -125,6 +187,46 @@ async def test_customized_noscript(tmp_path: Path):
         )
 
 
+async def test_default_noscript_rendered():
+    app = ReactPyCsr(Path(__file__).parent / "pyscript_components" / "root.py")
+
+    async with BackendFixture(app) as server:
+        url = f"http://{server.host}:{server.port}"
+        response = await asyncio.to_thread(
+            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+        )
+        assert response.status_code == 200
+        assert "<noscript>Enable JavaScript to view this site.</noscript>" in response.text
+
+
+
+async def test_noscript_omitted():
+    app = ReactPyCsr(Path(__file__).parent / "pyscript_components" / "root.py")
+
+    async with BackendFixture(app) as server:
+        url = f"http://{server.host}:{server.port}"
+        response = await asyncio.to_thread(
+            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+        )
+        assert response.status_code == 200
+        assert (
+            '<noscript><p id="noscript-message">Enable JavaScript to view this site.</p></noscript>'
+            in response.text
+        )
+
+
+async def test_noscript_disabled():
+    app = ReactPyCsr(Path(__file__).parent / "pyscript_components" / "root.py", html_noscript_str_or_path=None)
+
+    async with BackendFixture(app) as server:
+        url = f"http://{server.host}:{server.port}"
+        response = await asyncio.to_thread(
+            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+        )
+        assert response.status_code == 200
+        assert "<noscript>" not in response.text
+
+
 async def test_jinja_template_tag(jinja_display: DisplayFixture):
     await jinja_display.goto("/")
 

tests/test_asgi/test_standalone.py

@@ -139,7 +139,7 @@ def sample():
             assert (await new_display.page.title()) == custom_title
 
 
-async def test_customized_noscript(tmp_path: Path):
+async def test_customized_noscript_from_file(tmp_path: Path):
     @reactpy.component
     def sample():
         return html.h1("Hello World")
@@ -152,7 +152,7 @@ def sample():
 
     app = ReactPy(
         sample,
-        html_noscript_path=noscript_file,
+        html_noscript_str_or_path=noscript_file,
     )
 
     async with BackendFixture(app) as server:
@@ -167,6 +167,63 @@ def sample():
         )
 
 
+async def test_customized_noscript_from_string():
+    @reactpy.component
+    def sample():
+        return html.h1("Hello World")
+
+    app = ReactPy(
+        sample,
+        html_noscript_str_or_path='<p id="noscript-message">Please enable JavaScript.</p>',
+    )
+
+    async with BackendFixture(app) as server:
+        url = f"http://{server.host}:{server.port}"
+        response = await asyncio.to_thread(
+            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+        )
+        assert response.status_code == 200
+        assert (
+            '<noscript><p id="noscript-message">Please enable JavaScript.</p></noscript>'
+            in response.text
+        )
+
+
+async def test_noscript_omitted():
+    @reactpy.component
+    def sample():
+        return html.h1("Hello World")
+
+    app = ReactPy(sample)
+
+    async with BackendFixture(app) as server:
+        url = f"http://{server.host}:{server.port}"
+        response = await asyncio.to_thread(
+            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+        )
+        assert response.status_code == 200
+        assert (
+            '<noscript><p id="noscript-message">Enable JavaScript to view this site.</p></noscript>'
+            in response.text
+        )
+
+
+async def test_noscript_disabled():
+    @reactpy.component
+    def sample():
+        return html.h1("Hello World")
+
+    app = ReactPy(sample, html_noscript_str_or_path=None)
+
+    async with BackendFixture(app) as server:
+        url = f"http://{server.host}:{server.port}"
+        response = await asyncio.to_thread(
+            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+        )
+        assert response.status_code == 200
+        assert "<noscript>" not in response.text
+
+
 async def test_head_request():
     @reactpy.component
     def sample():

tests/test_asgi/test_utils.py

@@ -21,6 +21,18 @@ def test_html_noscript_path_to_html(tmp_path: Path):
     )
 
 
+
+def test_html_noscript_string_to_html():
+    assert (
+        utils.html_noscript_path_to_html("<p>Please enable JavaScript.</p>")
+        == "<noscript><p>Please enable JavaScript.</p></noscript>"
+    )
+
+
+def test_html_noscript_none_to_html():
+    assert utils.html_noscript_path_to_html(None) == ""
+
+
 def test_process_settings():
     utils.process_settings({"async_rendering": False})
     assert config.REACTPY_ASYNC_RENDERING.current is False