add more tests

Author: rmorshea

idom/core/events.py

@@ -189,7 +189,11 @@ def remove(self, function: Callable[..., Any]) -> None:
         Raises:
             ValueError: if not found
         """
-        self._handlers.remove(function)
+        index = self._get_handler_index(function)
+        if index is not None:
+            del self._handlers[index]
+        else:
+            raise ValueError(f"{self} does not contain {function}")
 
     def serialize(self) -> Dict[str, Any]:
         """Serialize the event handler."""
@@ -205,7 +209,20 @@ async def __call__(self, data: List[Any]) -> Any:
             await handler(*data)
 
     def __contains__(self, function: Any) -> bool:
-        return function in self._handlers
+        return self._get_handler_index(function) is not None
 
     def __repr__(self) -> str:  # pragma: no cover
         return f"{type(self).__name__}({self.serialize()})"
+
+    def _get_handler_index(self, function: Callable[..., Any]) -> Optional[int]:
+        if asyncio.iscoroutinefunction(function):
+            try:
+                return self._handlers.index(function)
+            except ValueError:
+                return None
+        else:
+            for i, h in enumerate(self._handlers):
+                if h.__wrapped__ == function:
+                    return i
+            else:
+                return None

tests/test_core/test_events.py

@@ -76,6 +76,15 @@ async def callback_2(event):
 
 
 def test_remove_event_handlers():
+    async def my_coro_callback(event):
+        ...
+
+    events = EventHandler()
+    events.add(my_coro_callback)
+    assert my_coro_callback in events
+    events.remove(my_coro_callback)
+    assert my_coro_callback not in events
+
     def my_callback(event):
         ...
 
@@ -108,13 +117,13 @@ def test_simple_click_event(driver, display):
 
     @idom.element
     async def Button():
-        update = hooks.current_hook().use_update()
+        hook = hooks.current_hook()
 
         async def on_click(event):
-            clicked.set(True)
-            update()
+            clicked.current = True
+            hook.schedule_render()
 
-        if not clicked.get():
+        if not clicked.current:
             return idom.html.button({"onClick": on_click, "id": "click"}, ["Click Me!"])
         else:
             return idom.html.p({"id": "complete"}, ["Complete"])
@@ -126,7 +135,7 @@ async def on_click(event):
     driver.find_element_by_id("complete")
 
     # we care what happens in the final delete when there's no value
-    assert clicked.get()
+    assert clicked.current
 
 
 def test_can_stop_event_propogation(driver, display):

tests/test_core/test_hooks.py

@@ -136,12 +136,93 @@ async def on_click(event):
     assert count.get_attribute("innerHTML") == "1"
 
 
-def test_set_state_with_reducer_instead_of_value():
-    assert False
+def test_set_state_with_reducer_instead_of_value(driver, display):
+    def increment(count):
+        return count + 1
 
+    @idom.element
+    async def Counter():
+        count, set_count = idom.hooks.use_state(0)
+        return idom.html.button(
+            {
+                "id": "counter",
+                "onClick": lambda event: set_count(increment),
+            },
+            f"Count: {count}",
+        )
 
-def test_set_state_checks_identity_not_equality():
-    assert False
+    display(Counter)
+
+    client_counter = driver.find_element_by_id("counter")
+
+    for i in range(3):
+        assert client_counter.get_attribute("innerHTML") == f"Count: {i}"
+        client_counter.click()
+
+
+def test_set_state_checks_identity_not_equality(driver, display, driver_wait):
+    r_1 = idom.Ref("value")
+    r_2 = idom.Ref("value")
+
+    # refs are equal but not identical
+    assert r_1 == r_2
+    assert r_1 is not r_2
+
+    render_count = idom.Ref(0)
+    event_count = idom.Ref(0)
+
+    def event_count_tracker(function):
+        def tracker(*args, **kwargs):
+            event_count.current += 1
+            return function(*args, **kwargs)
+
+        return tracker
+
+    @idom.element
+    async def TestElement():
+        state, set_state = idom.hooks.use_state(r_1)
+
+        render_count.current += 1
+        return idom.html.div(
+            idom.html.button(
+                {
+                    "id": "r_1",
+                    "onClick": event_count_tracker(lambda event: set_state(r_1)),
+                },
+                "r_1",
+            ),
+            idom.html.button(
+                {
+                    "id": "r_2",
+                    "onClick": event_count_tracker(lambda event: set_state(r_2)),
+                },
+                "r_2",
+            ),
+            f"Last state: {'r_1' if state is r_1 else 'r_2'}",
+        )
+
+    display(TestElement)
+
+    client_r_1_button = driver.find_element_by_id("r_1")
+    client_r_2_button = driver.find_element_by_id("r_2")
+
+    assert render_count.current == 1
+    assert event_count.current == 0
+
+    client_r_1_button.click()
+
+    driver_wait.until(lambda d: event_count.current == 1)
+    assert render_count.current == 1
+
+    client_r_2_button.click()
+
+    driver_wait.until(lambda d: event_count.current == 2)
+    assert render_count.current == 2
+
+    client_r_2_button.click()
+
+    driver_wait.until(lambda d: event_count.current == 3)
+    assert render_count.current == 2
 
 
 def test_simple_input_with_use_state(driver, display):