actually remove deprecated selenium usages

Author: rmorshea

tests/conftest.py

@@ -51,7 +51,7 @@ def mount_and_display(component_constructor, query=None, check_mount=True):
         )
         driver.get(server_mount_point.url(query=query))
         if check_mount:
-            driver.find_element_by_id(component_id)
+            driver.find_element("id", component_id)
         return component_id
 
     yield mount_and_display

tests/test_client.py

@@ -21,10 +21,10 @@ def OldComponent():
         mount_point.mount(OldComponent)
         driver.get(mount_point.url())
         # ensure the element is displayed before stopping the server
-        driver.find_element_by_id("old-component")
+        driver.find_element("id", "old-component")
 
     # the server is disconnected but the last view state is still shown
-    driver.find_element_by_id("old-component")
+    driver.find_element("id", "old-component")
 
     set_state = idom.Ref(None)
 
@@ -38,11 +38,11 @@ def NewComponent():
 
         # Note the lack of a page refresh before looking up this new component. The
         # client should attempt to reconnect and display the new view automatically.
-        driver.find_element_by_id("new-component-0")
+        driver.find_element("id", "new-component-0")
 
         # check that we can resume normal operation
         set_state.current(1)
-        driver.find_element_by_id("new-component-1")
+        driver.find_element("id", "new-component-1")
 
 
 def test_style_can_be_changed(display, driver, driver_wait):
@@ -69,7 +69,7 @@ def ButtonWithChangingColor():
 
     display(ButtonWithChangingColor)
 
-    button = driver.find_element_by_id("my-button")
+    button = driver.find_element("id", "my-button")
 
     assert get_style(button)["background-color"] == "red"
 

tests/test_core/test_component.py

@@ -50,7 +50,7 @@ def Hello():
 
     display(Hello)
 
-    assert driver.find_element_by_id("hello")
+    assert driver.find_element("id", "hello")
 
 
 def test_pre_tags_are_rendered_correctly(driver, display):
@@ -65,7 +65,7 @@ def PreFormated():
 
     display(PreFormated)
 
-    pre = driver.find_element_by_id("pre-form-test")
+    pre = driver.find_element("id", "pre-form-test")
 
     assert (
         pre.get_attribute("innerHTML")

tests/test_core/test_events.py

@@ -153,7 +153,7 @@ async def on_key_down(value):
 
     display(Input)
 
-    inp = driver.find_element_by_id("input")
+    inp = driver.find_element("id", "input")
     inp.send_keys("hello")
     # the default action of updating the element's value did not take place
     assert inp.get_attribute("value") == ""
@@ -174,9 +174,9 @@ async def on_click(event):
 
     display(Button)
 
-    button = driver.find_element_by_id("click")
+    button = driver.find_element("id", "click")
     button.click()
-    driver.find_element_by_id("complete")
+    driver.find_element("id", "complete")
 
 
 def test_can_stop_event_propogation(driver, driver_wait, display):
@@ -217,7 +217,7 @@ def outer_click_is_not_triggered(event):
 
     display(DivInDiv)
 
-    inner = driver.find_element_by_id("inner")
+    inner = driver.find_element("id", "inner")
     inner.click()
 
     driver_wait.until(lambda _: clicked.current)

tests/test_core/test_hooks.py

@@ -117,9 +117,9 @@ async def on_click(event):
 
     display(Outer)
 
-    outer = driver.find_element_by_id("outer")
-    inner = driver.find_element_by_id("inner")
-    count = driver.find_element_by_id("count-view")
+    outer = driver.find_element("id", "outer")
+    inner = driver.find_element("id", "inner")
+    count = driver.find_element("id", "count-view")
 
     driver_wait.until(lambda d: constructor_call_count.current == 1)
     driver_wait.until(lambda d: count.get_attribute("innerHTML") == "0")
@@ -157,7 +157,7 @@ def Counter():
 
     display(Counter)
 
-    client_counter = driver.find_element_by_id("counter")
+    client_counter = driver.find_element("id", "counter")
 
     for i in range(3):
         assert client_counter.get_attribute("innerHTML") == f"Count: {i}"
@@ -207,8 +207,8 @@ def TestComponent():
 
     display(TestComponent)
 
-    client_r_1_button = driver.find_element_by_id("r_1")
-    client_r_2_button = driver.find_element_by_id("r_2")
+    client_r_1_button = driver.find_element("id", "r_1")
+    client_r_2_button = driver.find_element("id", "r_2")
 
     assert render_count.current == 1
     assert event_count.current == 0
@@ -248,9 +248,9 @@ async def on_change(event):
 
     display(Input)
 
-    button = driver.find_element_by_id("input")
+    button = driver.find_element("id", "input")
     button.send_keys("this is a test")
-    driver.find_element_by_id("complete")
+    driver.find_element("id", "complete")
 
     assert message_ref.current == "this is a test"
 
@@ -273,9 +273,9 @@ def double_set_state(event):
 
     display(SomeComponent)
 
-    button = driver.find_element_by_id("button")
-    first = driver.find_element_by_id("first")
-    second = driver.find_element_by_id("second")
+    button = driver.find_element("id", "button")
+    first = driver.find_element("id", "first")
+    second = driver.find_element("id", "second")
 
     assert first.get_attribute("value") == "0"
     assert second.get_attribute("value") == "0"

tests/test_server/test_common/test_multiview.py

@@ -40,10 +40,10 @@ def test_multiview_server(driver_get, driver, server_mount_point):
     )
 
     driver_get({"view_id": manual_id})
-    driver.find_element_by_id("e1")
+    driver.find_element("id", "e1")
 
     driver_get({"view_id": auto_view_id})
-    driver.find_element_by_id("e2")
+    driver.find_element("id", "e2")
 
     server_mount_point.mount.remove(auto_view_id)
     server_mount_point.mount.remove(manual_id)

tests/test_server/test_common/test_per_client_state.py

@@ -31,12 +31,12 @@ def Hello():
 
     display(Hello)
 
-    assert driver.find_element_by_id("hello")
+    assert driver.find_element("id", "hello")
 
     # test that we can reconnect succefully
     driver.refresh()
 
-    assert driver.find_element_by_id("hello")
+    assert driver.find_element("id", "hello")
 
 
 def test_display_simple_click_counter(driver, driver_wait, display):
@@ -56,7 +56,7 @@ def Counter():
 
     display(Counter)
 
-    client_counter = driver.find_element_by_id("counter")
+    client_counter = driver.find_element("id", "counter")
 
     for i in range(3):
         driver_wait.until(

tests/test_server/test_common/test_shared_state_client.py

@@ -54,21 +54,21 @@ def Counter(count):
     driver_1.get(server_mount_point.url())
     driver_2.get(server_mount_point.url())
 
-    client_1_button = driver_1.find_element_by_id("incr-button")
-    client_2_button = driver_2.find_element_by_id("incr-button")
+    client_1_button = driver_1.find_element("id", "incr-button")
+    client_2_button = driver_2.find_element("id", "incr-button")
 
-    driver_1.find_element_by_id("count-is-0")
-    driver_2.find_element_by_id("count-is-0")
+    driver_1.find_element("id", "count-is-0")
+    driver_2.find_element("id", "count-is-0")
 
     client_1_button.click()
 
-    driver_1.find_element_by_id("count-is-1")
-    driver_2.find_element_by_id("count-is-1")
+    driver_1.find_element("id", "count-is-1")
+    driver_2.find_element("id", "count-is-1")
 
     client_2_button.click()
 
-    driver_1.find_element_by_id("count-is-2")
-    driver_2.find_element_by_id("count-is-2")
+    driver_1.find_element("id", "count-is-2")
+    driver_2.find_element("id", "count-is-2")
 
     assert was_garbage_collected.wait(1)
     was_garbage_collected.clear()
@@ -79,18 +79,18 @@ def Counter(count):
     driver_1.refresh()
     driver_2.refresh()
 
-    client_1_button = driver_1.find_element_by_id("incr-button")
-    client_2_button = driver_2.find_element_by_id("incr-button")
+    client_1_button = driver_1.find_element("id", "incr-button")
+    client_2_button = driver_2.find_element("id", "incr-button")
 
     client_1_button.click()
 
-    driver_1.find_element_by_id("count-is-3")
-    driver_2.find_element_by_id("count-is-3")
+    driver_1.find_element("id", "count-is-3")
+    driver_2.find_element("id", "count-is-3")
 
     client_1_button.click()
 
-    driver_1.find_element_by_id("count-is-4")
-    driver_2.find_element_by_id("count-is-4")
+    driver_1.find_element("id", "count-is-4")
+    driver_2.find_element("id", "count-is-4")
 
     client_2_button.click()
 

tests/test_web/test_module.py

@@ -35,17 +35,17 @@ def ShowCurrentComponent():
 
     display(ShowCurrentComponent)
 
-    driver.find_element_by_id("some-component")
+    driver.find_element("id", "some-component")
 
     set_current_component.current(
         idom.html.h1({"id": "some-other-component"}, "some other component")
     )
 
     # the new component has been displayed
-    driver.find_element_by_id("some-other-component")
+    driver.find_element("id", "some-other-component")
 
     # the unmount callback for the old component was called
-    driver.find_element_by_id("unmount-flag")
+    driver.find_element("id", "unmount-flag")
 
 
 def test_module_from_url(driver):
@@ -70,7 +70,7 @@ def ShowSimpleButton():
     with ServerMountPoint(PerClientStateServer, app=app) as mount_point:
         mount_point.mount(ShowSimpleButton)
         driver.get(mount_point.url())
-        driver.find_element_by_id("my-button")
+        driver.find_element("id", "my-button")
 
 
 def test_module_from_template_where_template_does_not_exist():
@@ -108,7 +108,7 @@ def ShowSimpleButton():
 
     display(ShowSimpleButton)
 
-    button = driver.find_element_by_id("my-button")
+    button = driver.find_element("id", "my-button")
     button.click()
     driver_wait.until(lambda d: is_clicked.current)
 
@@ -178,11 +178,11 @@ def test_module_exports_multiple_components(driver, display):
 
     display(lambda: Header1({"id": "my-h1"}, "My Header 1"))
 
-    driver.find_element_by_id("my-h1")
+    driver.find_element("id", "my-h1")
 
     display(lambda: Header2({"id": "my-h2"}, "My Header 2"))
 
-    driver.find_element_by_id("my-h2")
+    driver.find_element("id", "my-h2")
 
 
 def test_imported_components_can_render_children(driver, display):
@@ -199,7 +199,7 @@ def test_imported_components_can_render_children(driver, display):
         )
     )
 
-    parent = driver.find_element_by_id("the-parent")
+    parent = driver.find_element("id", "the-parent")
     children = parent.find_elements_by_tag_name("li")
 
     assert len(children) == 3

tests/test_widgets.py

@@ -51,13 +51,13 @@ async def on_click(event):
 
     display(ButtonSwapsDivs)
 
-    client_incr_button = driver.find_element_by_id("incr-button")
+    client_incr_button = driver.find_element("id", "incr-button")
 
-    driver.find_element_by_id("hotswap-1")
+    driver.find_element("id", "hotswap-1")
     client_incr_button.click()
-    driver.find_element_by_id("hotswap-2")
+    driver.find_element("id", "hotswap-2")
     client_incr_button.click()
-    driver.find_element_by_id("hotswap-3")
+    driver.find_element("id", "hotswap-3")
 
 
 IMAGE_SRC_BYTES = b"""
@@ -71,14 +71,14 @@ async def on_click(event):
 def test_image_from_string(driver, display):
     src = IMAGE_SRC_BYTES.decode()
     display(lambda: idom.widgets.image("svg", src, {"id": "a-circle-1"}))
-    client_img = driver.find_element_by_id("a-circle-1")
+    client_img = driver.find_element("id", "a-circle-1")
     assert BASE64_IMAGE_SRC in client_img.get_attribute("src")
 
 
 def test_image_from_bytes(driver, display):
     src = IMAGE_SRC_BYTES
     display(lambda: idom.widgets.image("svg", src, {"id": "a-circle-1"}))
-    client_img = driver.find_element_by_id("a-circle-1")
+    client_img = driver.find_element("id", "a-circle-1")
     assert BASE64_IMAGE_SRC in client_img.get_attribute("src")
 
 
@@ -94,7 +94,7 @@ def test_input_callback(driver, driver_wait, display):
         )
     )
 
-    client_inp = driver.find_element_by_id("inp")
+    client_inp = driver.find_element("id", "inp")
     assert client_inp.get_attribute("value") == "initial-value"
 
     client_inp.clear()
@@ -132,8 +132,8 @@ def InputWrapper():
 
     display(InputWrapper)
 
-    client_inp_ignore = driver.find_element_by_id("inp-ignore")
-    client_inp_not_ignore = driver.find_element_by_id("inp-not-ignore")
+    client_inp_ignore = driver.find_element("id", "inp-ignore")
+    client_inp_not_ignore = driver.find_element("id", "inp-not-ignore")
 
     send_keys(client_inp_ignore, Keys.BACKSPACE)
     time.sleep(0.1)  # waiting and deleting again seems to decrease flakiness