Fix tests

Author: Archmonger

tests/test_asgi/test_standalone.py

@@ -40,7 +40,7 @@ def Counter():
         return reactpy.html.button(
             {
                 "id": "counter",
-                "on_click": lambda event: set_count(lambda old_count: old_count + 1),
+                "onClick": lambda event: set_count(lambda old_count: old_count + 1),
             },
             f"Count: {count}",
         )

tests/test_client.py

@@ -18,9 +18,9 @@ async def test_automatic_reconnect(
     def SomeComponent():
         count, incr_count = use_counter(0)
         return reactpy.html.fragment(
-            reactpy.html.p({"data_count": count, "id": "count"}, "count", count),
+            reactpy.html.p({"data-count": count, "id": "count"}, "count", count),
             reactpy.html.button(
-                {"on_click": lambda e: incr_count(), "id": "incr"}, "incr"
+                {"onClick": lambda e: incr_count(), "id": "incr"}, "incr"
             ),
         )
 
@@ -74,8 +74,8 @@ def ButtonWithChangingColor():
         return reactpy.html.button(
             {
                 "id": "my-button",
-                "on_click": lambda event: set_color_toggle(not color_toggle),
-                "style": {"background_color": color, "color": "white"},
+                "onClick": lambda event: set_color_toggle(not color_toggle),
+                "style": {"backgroundColor": color, "color": "white"},
             },
             f"color: {color}",
         )
@@ -117,35 +117,11 @@ async def handle_change(event):
             await asyncio.sleep(delay)
             set_value(event["target"]["value"])
 
-        return reactpy.html.input({"on_change": handle_change, "id": "test-input"})
+        return reactpy.html.input({"onChange": handle_change, "id": "test-input"})
 
     await display.show(SomeComponent)
 
     inp = await display.page.wait_for_selector("#test-input")
     await inp.type("hello", delay=DEFAULT_TYPE_DELAY)
 
     assert (await inp.evaluate("node => node.value")) == "hello"
-
-
-async def test_snake_case_attributes(display: DisplayFixture):
-    @reactpy.component
-    def SomeComponent():
-        return reactpy.html.h1(
-            {
-                "id": "my-title",
-                "style": {"background_color": "blue"},
-                "class_name": "hello",
-                "data_some_thing": "some-data",
-                "aria_some_thing": "some-aria",
-            },
-            "title with some attributes",
-        )
-
-    await display.show(SomeComponent)
-
-    title = await display.page.wait_for_selector("#my-title")
-
-    assert await title.get_attribute("class") == "hello"
-    assert await title.get_attribute("style") == "background-color: blue;"
-    assert await title.get_attribute("data-some-thing") == "some-data"
-    assert await title.get_attribute("aria-some-thing") == "some-aria"

tests/test_console/test_rewrite_props.py

@@ -14,15 +14,15 @@ def test_rewrite_camel_case_props_declarations(tmp_path):
     runner = CliRunner()
 
     tempfile: Path = tmp_path / "temp.py"
-    tempfile.write_text("html.div(dict(camelCase='test'))")
+    tempfile.write_text("html.div(dict(example_attribute='test'))")
     result = runner.invoke(
         rewrite_props,
         args=[str(tmp_path)],
         catch_exceptions=False,
     )
 
     assert result.exit_code == 0
-    assert tempfile.read_text() == "html.div(dict(camel_case='test'))"
+    assert tempfile.read_text() == "html.div(dict(exampleAttribute='test'))"
 
 
 def test_rewrite_camel_case_props_declarations_no_files():
@@ -41,48 +41,48 @@ def test_rewrite_camel_case_props_declarations_no_files():
     "source, expected",
     [
         (
-            "html.div(dict(camelCase='test'))",
             "html.div(dict(camel_case='test'))",
+            "html.div(dict(camelCase='test'))",
         ),
         (
-            "reactpy.html.button({'onClick': block_forever})",
             "reactpy.html.button({'on_click': block_forever})",
+            "reactpy.html.button({'onClick': block_forever})",
         ),
         (
-            "html.div(dict(style={'testThing': test}))",
             "html.div(dict(style={'test_thing': test}))",
+            "html.div(dict(style={'testThing': test}))",
         ),
         (
-            "html.div(dict(style=dict(testThing=test)))",
             "html.div(dict(style=dict(test_thing=test)))",
+            "html.div(dict(style=dict(testThing=test)))",
         ),
         (
-            "vdom('tag', dict(camelCase='test'))",
             "vdom('tag', dict(camel_case='test'))",
+            "vdom('tag', dict(camelCase='test'))",
         ),
         (
-            "vdom('tag', dict(camelCase='test', **props))",
             "vdom('tag', dict(camel_case='test', **props))",
+            "vdom('tag', dict(camelCase='test', **props))",
         ),
         (
-            "html.div({'camelCase': test, 'data-thing': test})",
             "html.div({'camel_case': test, 'data-thing': test})",
+            "html.div({'camelCase': test, 'data-thing': test})",
         ),
         (
-            "html.div({'camelCase': test, ignore: this})",
             "html.div({'camel_case': test, ignore: this})",
+            "html.div({'camelCase': test, ignore: this})",
         ),
         # no rewrite
         (
-            "html.div({'snake_case': test})",
+            "html.div({'camelCase': test})",
             None,
         ),
         (
             "html.div({'data-case': test})",
             None,
         ),
         (
-            "html.div(dict(snake_case='test'))",
+            "html.div(dict(camelCase='test'))",
             None,
         ),
         (

tests/test_core/test_events.py

@@ -151,7 +151,7 @@ def Input():
         async def on_key_down(value):
             pass
 
-        return reactpy.html.input({"on_key_down": on_key_down, "id": "input"})
+        return reactpy.html.input({"onKeyDown": on_key_down, "id": "input"})
 
     await display.show(Input)
 
@@ -171,7 +171,7 @@ async def on_click(event):
 
         if not clicked:
             return reactpy.html.button(
-                {"on_click": on_click, "id": "click"}, ["Click Me!"]
+                {"onClick": on_click, "id": "click"}, ["Click Me!"]
             )
         else:
             return reactpy.html.p({"id": "complete"}, ["Complete"])
@@ -197,18 +197,18 @@ def outer_click_is_not_triggered(event):
 
         outer = reactpy.html.div(
             {
-                "style": {"height": "35px", "width": "35px", "background_color": "red"},
-                "on_click": outer_click_is_not_triggered,
+                "style": {"height": "35px", "width": "35px", "backgroundColor": "red"},
+                "onClick": outer_click_is_not_triggered,
                 "id": "outer",
             },
             reactpy.html.div(
                 {
                     "style": {
                         "height": "30px",
                         "width": "30px",
-                        "background_color": "blue",
+                        "backgroundColor": "blue",
                     },
-                    "on_click": inner_click_no_op,
+                    "onClick": inner_click_no_op,
                     "id": "inner",
                 }
             ),

tests/test_core/test_hooks.py

@@ -186,14 +186,14 @@ def TestComponent():
             reactpy.html.button(
                 {
                     "id": "r_1",
-                    "on_click": event_count_tracker(lambda event: set_state(r_1)),
+                    "onClick": event_count_tracker(lambda event: set_state(r_1)),
                 },
                 "r_1",
             ),
             reactpy.html.button(
                 {
                     "id": "r_2",
-                    "on_click": event_count_tracker(lambda event: set_state(r_2)),
+                    "onClick": event_count_tracker(lambda event: set_state(r_2)),
                 },
                 "r_2",
             ),
@@ -240,7 +240,7 @@ async def on_change(event):
                 set_message(event["target"]["value"])
 
         if message is None:
-            return reactpy.html.input({"id": "input", "on_change": on_change})
+            return reactpy.html.input({"id": "input", "onChange": on_change})
         else:
             return reactpy.html.p({"id": "complete"}, ["Complete"])
 
@@ -271,7 +271,7 @@ def double_set_state(event):
                 {"id": "second", "data-value": state_2}, f"value is: {state_2}"
             ),
             reactpy.html.button(
-                {"id": "button", "on_click": double_set_state}, "click me"
+                {"id": "button", "onClick": double_set_state}, "click me"
             ),
         )
 

tests/test_core/test_layout.py

@@ -510,10 +510,10 @@ def bad_trigger():
 
         children = [
             reactpy.html.button(
-                {"on_click": good_trigger, "id": "good", "key": "good"}, "good"
+                {"onClick": good_trigger, "id": "good", "key": "good"}, "good"
             ),
             reactpy.html.button(
-                {"on_click": bad_trigger, "id": "bad", "key": "bad"}, "bad"
+                {"onClick": bad_trigger, "id": "bad", "key": "bad"}, "bad"
             ),
         ]
 
@@ -572,7 +572,7 @@ def callback():
                 msg = "Called bad trigger"
                 raise ValueError(msg)
 
-        return reactpy.html.button({"on_click": callback, "id": "good"}, "good")
+        return reactpy.html.button({"onClick": callback, "id": "good"}, "good")
 
     async with reactpy.Layout(RootComponent()) as layout:
         await layout.render()
@@ -654,8 +654,8 @@ def HasEventHandlerAtRoot():
         value, set_value = reactpy.hooks.use_state(False)
         set_value(not value)  # trigger renders forever
         event_handler.current = weakref(set_value)
-        button = reactpy.html.button({"on_click": set_value}, "state is: ", value)
-        event_handler.current = weakref(button["eventHandlers"]["on_click"].function)
+        button = reactpy.html.button({"onClick": set_value}, "state is: ", value)
+        event_handler.current = weakref(button["eventHandlers"]["onClick"].function)
         return button
 
     async with reactpy.Layout(HasEventHandlerAtRoot()) as layout:
@@ -676,8 +676,8 @@ def HasNestedEventHandler():
         value, set_value = reactpy.hooks.use_state(False)
         set_value(not value)  # trigger renders forever
         event_handler.current = weakref(set_value)
-        button = reactpy.html.button({"on_click": set_value}, "state is: ", value)
-        event_handler.current = weakref(button["eventHandlers"]["on_click"].function)
+        button = reactpy.html.button({"onClick": set_value}, "state is: ", value)
+        event_handler.current = weakref(button["eventHandlers"]["onClick"].function)
         return reactpy.html.div(reactpy.html.div(button))
 
     async with reactpy.Layout(HasNestedEventHandler()) as layout:
@@ -759,7 +759,7 @@ def raise_error():
             msg = "bad event handler"
             raise Exception(msg)
 
-        return reactpy.html.button({"on_click": raise_error})
+        return reactpy.html.button({"onClick": raise_error})
 
     with assert_reactpy_did_log(match_error="bad event handler"):
         async with reactpy.Layout(ComponentWithBadEventHandler()) as layout:
@@ -857,7 +857,7 @@ def SomeComponent():
             [
                 reactpy.html.div(
                     {"key": i},
-                    reactpy.html.input({"on_change": lambda event: None}),
+                    reactpy.html.input({"onChange": lambda event: None}),
                 )
                 for i in items
             ]
@@ -915,14 +915,14 @@ def Root():
         toggle, toggle_type.current = use_toggle(True)
         handler = element_static_handler.use(lambda: None)
         if toggle:
-            return html.div(html.button({"on_event": handler}))
+            return html.div(html.button({"onEvent": handler}))
         else:
             return html.div(SomeComponent())
 
     @reactpy.component
     def SomeComponent():
         handler = component_static_handler.use(lambda: None)
-        return html.button({"on_another_event": handler})
+        return html.button({"onAnotherEvent": handler})
 
     async with reactpy.Layout(Root()) as layout:
         await layout.render()
@@ -1005,7 +1005,7 @@ def Parent():
         state, set_state = use_state(0)
         return html.div(
             html.button(
-                {"on_click": set_child_key_num.use(lambda: set_state(state + 1))},
+                {"onClick": set_child_key_num.use(lambda: set_state(state + 1))},
                 "click me",
             ),
             Child("some-key"),
@@ -1217,8 +1217,8 @@ def colorize(event):
 
         return html.div(
             {"id": item, "color": color.value},
-            html.button({"on_click": colorize}, f"Color {item}"),
-            html.button({"on_click": deleteme}, f"Delete {item}"),
+            html.button({"onClick": colorize}, f"Color {item}"),
+            html.button({"onClick": deleteme}, f"Delete {item}"),
         )
 
     @component
@@ -1233,7 +1233,7 @@ def App():
         b, b_info = find_element(tree, select.id_equals("B"))
         assert b_info.path == (0, 1, 0)
         b_delete, _ = find_element(b, select.text_equals("Delete B"))
-        await runner.trigger(b_delete, "on_click", {})
+        await runner.trigger(b_delete, "onClick", {})
 
         tree = await runner.render()
 
@@ -1242,7 +1242,7 @@ def App():
         c, c_info = find_element(tree, select.id_equals("C"))
         assert c_info.path == (0, 1, 0)
         c_color, _ = find_element(c, select.text_equals("Color C"))
-        await runner.trigger(c_color, "on_click", {})
+        await runner.trigger(c_color, "onClick", {})
 
         tree = await runner.render()
 

tests/test_core/test_serve.py

@@ -15,7 +15,7 @@
 from tests.tooling.aio import Event
 from tests.tooling.common import event_message
 
-EVENT_NAME = "on_event"
+EVENT_NAME = "onEvent"
 STATIC_EVENT_HANDLER = StaticEventHandler()
 
 
@@ -126,8 +126,8 @@ def set_did_render():
             did_render.set()
 
         return reactpy.html.div(
-            reactpy.html.button({"on_click": block_forever}),
-            reactpy.html.button({"on_click": handle_event}),
+            reactpy.html.button({"onClick": block_forever}),
+            reactpy.html.button({"onClick": handle_event}),
         )
 
     send_queue = asyncio.Queue()