fix test_html

Author: rmorshea

re.txt

@@ -0,0 +1,12 @@
+def test_(.*?)\(.*driver.*\):
+async def test_$1(display: DisplayFixture):
+
+display\((.*?)\)
+page = await display.show($1)
+
+driver\.find_element\("id", "(.*?)"\)
+await display.wait_for_selector("#$1")
+
+driver_wait\.until\(lambda .*: (\w*)\.get_attribute\("(.*?)"\) == (.*)\)
+assert (await $1.evaluate("node => node['$2']")) == $3
+await poll($1.evaluate, "node => node['$2']").until_equals($3)

src/idom/testing.py

@@ -82,33 +82,41 @@ def __init__(
 
             async def until(
                 condition: Callable[[_R], bool], timeout: float = _DEFAULT_TIMEOUT
-            ) -> _R:
+            ) -> None:
                 started_at = time.time()
-                while not condition(await function(*args, **kwargs)):
-                    if (time.time() - started_at) > timeout:
-                        raise TimeoutError()
+                while True:
+                    result = await function(*args, **kwargs)
+                    if condition(result):
+                        break
+                    elif (time.time() - started_at) > timeout:
+                        raise TimeoutError(
+                            f"Condition not met within {timeout} "
+                            f"seconds - last value was {result!r}"
+                        )
 
         else:
 
             def until(
                 condition: Callable[[_R], bool] | Any, timeout: float = _DEFAULT_TIMEOUT
-            ) -> _R:
+            ) -> None:
                 started_at = time.time()
-                while not condition(function(*args, **kwargs)):
-                    if (time.time() - started_at) > timeout:
-                        raise TimeoutError()
+                while True:
+                    result = function(*args, **kwargs)
+                    if condition(result):
+                        break
+                    elif (time.time() - started_at) > timeout:
+                        raise TimeoutError(
+                            f"Condition not met within {timeout} "
+                            f"seconds - last value was {result!r}"
+                        )
 
         self.until: Callable[[Callable[[_R], bool]], Any] = until
         """Check that the coroutines result meets a condition within the timeout"""
 
-    def eq(self, right: Any, timeout: float = _DEFAULT_TIMEOUT) -> Any:
+    def until_equals(self, right: Any, timeout: float = _DEFAULT_TIMEOUT) -> Any:
         """Wait until the result is equal to the given value"""
         return self.until(lambda left: left == right, timeout)
 
-    def ne(self, right: Any, timeout: float = _DEFAULT_TIMEOUT) -> Any:
-        """Wait until the result is not equal to the given value"""
-        return self.until(lambda left: left != right, timeout)
-
 
 class DisplayFixture:
     """A fixture for running web-based tests using ``playwright``"""
@@ -126,7 +134,7 @@ def __init__(
             if isinstance(driver, Page):
                 self._page = driver
             else:
-                self._browser = browser
+                self._browser = driver
         self._next_view_id = 0
 
     async def show(
@@ -139,7 +147,7 @@ async def show(
         self.server.mount(lambda: html.div({"id": view_id}, component()))
 
         await self._page.goto(self.server.url(query=query))
-        await self._page.wait_for_selector(f"#{view_id}")
+        await self._page.wait_for_selector(f"#{view_id}", state="attached")
 
         return self._page
 

tests/conftest.py

@@ -25,9 +25,9 @@ async def display(server, page):
         yield display
 
 
-@pytest.fixture(scope="session", params=list(all_implementations()))
-async def server(request):
-    async with ServerFixture(implementation=request.param) as server:
+@pytest.fixture(scope="session")
+async def server():
+    async with ServerFixture() as server:
         yield server
 
 

tests/test_html.py

@@ -1,11 +1,12 @@
 import pytest
 
 from idom import component, config, html, use_state
+from idom.testing import DisplayFixture, poll
 from idom.utils import Ref
 
 
-def use_toggle():
-    state, set_state = use_state(True)
+def use_toggle(initial=True):
+    state, set_state = use_state(initial)
     return state, lambda: set_state(not state)
 
 
@@ -14,20 +15,15 @@ def use_counter(initial_value):
     return state, lambda: set_state(state + 1)
 
 
-def test_script_mount_unmount(driver, driver_wait, display):
+async def test_script_mount_unmount(display: DisplayFixture):
     toggle_is_mounted = Ref()
 
     @component
     def Root():
         is_mounted, toggle_is_mounted.current = use_toggle()
-        if is_mounted:
-            el = HasScript()
-        else:
-            el = html.div()
-
         return html.div(
             html.div({"id": "mount-state", "data-value": False}),
-            el,
+            HasScript() if is_mounted else html.div(),
         )
 
     @component
@@ -43,22 +39,23 @@ def HasScript():
             }"""
         )
 
-    display(Root)
+    page = await display.show(Root)
 
-    mount_state = driver.find_element("id", "mount-state")
+    mount_state = await page.wait_for_selector("#mount-state", state="attached")
+    poll_mount_state = poll(mount_state.get_attribute, "data-value")
 
-    driver_wait.until(lambda d: mount_state.get_attribute("data-value") == "true")
+    await poll_mount_state.until_equals("true")
 
     toggle_is_mounted.current()
 
-    driver_wait.until(lambda d: mount_state.get_attribute("data-value") == "false")
+    await poll_mount_state.until_equals("false")
 
     toggle_is_mounted.current()
 
-    driver_wait.until(lambda d: mount_state.get_attribute("data-value") == "true")
+    await poll_mount_state.until_equals("true")
 
 
-def test_script_re_run_on_content_change(driver, driver_wait, display):
+async def test_script_re_run_on_content_change(display: DisplayFixture):
     incr_count = Ref()
 
     @component
@@ -77,26 +74,29 @@ def HasScript():
             ),
         )
 
-    display(HasScript)
+    page = await display.show(HasScript)
 
-    mount_count = driver.find_element("id", "mount-count")
-    unmount_count = driver.find_element("id", "unmount-count")
+    mount_count = await page.wait_for_selector("#mount-count", state="attached")
+    poll_mount_count = poll(mount_count.get_attribute, "data-value")
 
-    driver_wait.until(lambda d: mount_count.get_attribute("data-value") == "1")
-    driver_wait.until(lambda d: unmount_count.get_attribute("data-value") == "0")
+    unmount_count = await page.wait_for_selector("#unmount-count", state="attached")
+    poll_unmount_count = poll(unmount_count.get_attribute, "data-value")
+
+    await poll_mount_count.until_equals("1")
+    await poll_unmount_count.until_equals("0")
 
     incr_count.current()
 
-    driver_wait.until(lambda d: mount_count.get_attribute("data-value") == "2")
-    driver_wait.until(lambda d: unmount_count.get_attribute("data-value") == "1")
+    await poll_mount_count.until_equals("2")
+    await poll_unmount_count.until_equals("1")
 
     incr_count.current()
 
-    driver_wait.until(lambda d: mount_count.get_attribute("data-value") == "3")
-    driver_wait.until(lambda d: unmount_count.get_attribute("data-value") == "2")
+    await poll_mount_count.until_equals("3")
+    await poll_unmount_count.until_equals("2")
 
 
-def test_script_from_src(driver, driver_wait, display):
+async def test_script_from_src(display: DisplayFixture):
     incr_src_id = Ref()
     file_name_template = "__some_js_script_{src_id}__.js"
 
@@ -114,7 +114,7 @@ def HasScript():
                 ),
             )
 
-    display(HasScript)
+    page = await display.show(HasScript)
 
     for i in range(1, 4):
         script_file = config.IDOM_WEB_MODULES_DIR.current / file_name_template.format(
@@ -129,9 +129,9 @@ def HasScript():
 
         incr_src_id.current()
 
-        run_count = driver.find_element("id", "run-count")
-
-        driver_wait.until(lambda d: (run_count.get_attribute("data-value") == "1"))
+        run_count = await page.wait_for_selector("#run-count", state="attached")
+        poll_run_count = poll(run_count.get_attribute, "data-value")
+        await poll_run_count.until_equals("1")
 
 
 def test_script_may_only_have_one_child():

tests/test_widgets.py

@@ -127,12 +127,12 @@ def SomeComponent():
 
     poll_value = poll(lambda: value.current)
 
-    poll_value.eq("hello")
+    poll_value.until_equals("hello")
 
     await input_2.focus()
     await input_2.type(" world", delay=20)
 
-    poll_value.eq("hello world")
+    poll_value.until_equals("hello world")
 
 
 async def test_use_linked_inputs_on_change_with_cast(display: DisplayFixture):
@@ -154,12 +154,12 @@ def SomeComponent():
 
     poll_value = poll(lambda: value.current)
 
-    poll_value.eq(1)
+    poll_value.until_equals(1)
 
     await input_2.focus()
     await input_2.type("2")
 
-    poll_value.eq(12)
+    poll_value.until_equals(12)
 
 
 async def test_use_linked_inputs_ignore_empty(display: DisplayFixture):
@@ -183,13 +183,13 @@ def SomeComponent():
 
     poll_value = poll(lambda: value.current)
 
-    poll_value.eq("1")
+    poll_value.until_equals("1")
 
     await input_2.focus()
     await input_2.press("Backspace")
 
-    poll_value.eq("1")
+    poll_value.until_equals("1")
 
     await input_1.type("2")
 
-    poll_value.eq("2")
+    poll_value.until_equals("2")

tests/tooling/loop.py

@@ -1,8 +1,12 @@
 import asyncio
+from asyncio import wait_for
 from contextlib import contextmanager
 from typing import Iterator
 
 
+TIMEOUT = 3
+
+
 @contextmanager
 def open_event_loop() -> Iterator[asyncio.AbstractEventLoop]:
     loop = asyncio.new_event_loop()
@@ -13,8 +17,8 @@ def open_event_loop() -> Iterator[asyncio.AbstractEventLoop]:
     finally:
         try:
             _cancel_all_tasks(loop)
-            loop.run_until_complete(loop.shutdown_asyncgens())
-            loop.run_until_complete(loop.shutdown_default_executor())
+            loop.run_until_complete(wait_for(loop.shutdown_asyncgens(), TIMEOUT))
+            loop.run_until_complete(wait_for(loop.shutdown_default_executor(), TIMEOUT))
         finally:
             asyncio.set_event_loop(None)
             loop.close()
@@ -29,7 +33,7 @@ def _cancel_all_tasks(loop: asyncio.AbstractEventLoop) -> None:
         task.cancel()
 
     loop.run_until_complete(
-        asyncio.gather(*to_cancel, loop=loop, return_exceptions=True)
+        wait_for(asyncio.gather(*to_cancel, loop=loop, return_exceptions=True), TIMEOUT)
     )
 
     for task in to_cancel: