commit 6764982edefb6be1c65e5a28d2be6ff6c1a45123 parent 29488c86661c4ae5d60ea6159965b07f38776ea4 Author: elkal98 <khalid.alhaddad98@gmail.com> Date: Fri, 24 Oct 2025 13:30:10 +0000 Bug 1995702 - Rename WebDriver client method from "switch_frame" to "switch_to_frame" for consistency with the specification. r=whimboo Differential Revision: https://phabricator.services.mozilla.com/D269745 Diffstat:
42 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/testing/web-platform/mozilla/tests/webdriver/classic/perform_actions/pointer_mouse.py b/testing/web-platform/mozilla/tests/webdriver/classic/perform_actions/pointer_mouse.py @@ -32,7 +32,7 @@ async def test_click_in_display_none_frame(session, inline): session.url = url frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) button = session.find.css("button", all=False) mouse_chain = session.actions.sequence( diff --git a/testing/web-platform/tests/tools/webdriver/webdriver/client.py b/testing/web-platform/tests/tools/webdriver/webdriver/client.py @@ -598,7 +598,7 @@ class Session: body = {"handle": handle} return self.send_session_command("POST", "window", body=body) - def switch_frame(self, frame): + def switch_to_frame(self, frame): body = {"id": frame} return self.send_session_command("POST", "frame", body=body) diff --git a/testing/web-platform/tests/webdriver/tests/classic/back/back.py b/testing/web-platform/tests/webdriver/tests/classic/back/back.py @@ -126,7 +126,7 @@ def test_removed_iframe(session, url, inline): session.url = url("/webdriver/tests/support/html/frames_no_bfcache.html") subframe = session.find.css("#sub-frame", all=False) - session.switch_frame(subframe) + session.switch_to_frame(subframe) response = back(session) assert_success(response) diff --git a/testing/web-platform/tests/webdriver/tests/classic/close_window/close.py b/testing/web-platform/tests/webdriver/tests/classic/close_window/close.py @@ -20,10 +20,10 @@ def test_no_browsing_context(session, url): session.url = url("/webdriver/tests/support/html/frames.html") subframe = session.find.css("#sub-frame", all=False) - session.switch_frame(subframe) + session.switch_to_frame(subframe) frame = session.find.css("#delete-frame", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) button = session.find.css("#remove-parent", all=False) button.click() diff --git a/testing/web-platform/tests/webdriver/tests/classic/element_clear/clear.py b/testing/web-platform/tests/webdriver/tests/classic/element_clear/clear.py @@ -95,7 +95,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/element_click/click.py b/testing/web-platform/tests/webdriver/tests/classic/element_click/click.py @@ -78,7 +78,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("input#text", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/element_click/navigate.py b/testing/web-platform/tests/webdriver/tests/classic/element_click/navigate.py @@ -131,7 +131,7 @@ def test_link_from_nested_context_with_target(session, inline, iframe, target): session.url = inline(iframe("<a href='{}' target='{}'>click</a>".format(target_page, target))) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("a", all=False) orig_handles = session.handles @@ -148,7 +148,7 @@ def test_link_from_nested_context_with_target(session, inline, iframe, target): if target == "_parent": session.switch_to_parent_frame() elif target == "_top": - session.switch_frame(None) + session.switch_to_frame(None) wait = Poll( session, diff --git a/testing/web-platform/tests/webdriver/tests/classic/element_send_keys/interactability.py b/testing/web-platform/tests/webdriver/tests/classic/element_send_keys/interactability.py @@ -67,7 +67,7 @@ def test_iframe_is_interactable(session, inline, iframe): # Any key events are immediately routed to the nested # browsing context's active document. - session.switch_frame(frame) + session.switch_to_frame(frame) result = session.find.css("input", all=False) assert result.property("value") == "foo" diff --git a/testing/web-platform/tests/webdriver/tests/classic/element_send_keys/send_keys.py b/testing/web-platform/tests/webdriver/tests/classic/element_send_keys/send_keys.py @@ -91,7 +91,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("input#text", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/execute_async_script/arguments.py b/testing/web-platform/tests/webdriver/tests/classic/execute_async_script/arguments.py @@ -89,7 +89,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) @@ -138,7 +138,7 @@ def test_no_such_shadow_root_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("custom-element", all=False) shadow_root = element.shadow_root diff --git a/testing/web-platform/tests/webdriver/tests/classic/execute_async_script/node.py b/testing/web-platform/tests/webdriver/tests/classic/execute_async_script/node.py @@ -25,7 +25,7 @@ def test_detached_shadow_root(session, get_test_page, as_frame): if as_frame: frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("custom-element", all=False) @@ -46,7 +46,7 @@ def test_stale_element(session, get_test_page, as_frame): if as_frame: frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/execute_script/arguments.py b/testing/web-platform/tests/webdriver/tests/classic/execute_script/arguments.py @@ -77,7 +77,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) @@ -120,7 +120,7 @@ def test_no_such_shadow_root_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("custom-element", all=False) shadow_root = element.shadow_root diff --git a/testing/web-platform/tests/webdriver/tests/classic/execute_script/node.py b/testing/web-platform/tests/webdriver/tests/classic/execute_script/node.py @@ -24,7 +24,7 @@ def test_detached_shadow_root(session, get_test_page, as_frame): if as_frame: frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("custom-element", all=False) @@ -45,7 +45,7 @@ def test_stale_element(session, get_test_page, as_frame): if as_frame: frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/find_element_from_element/find.py b/testing/web-platform/tests/webdriver/tests/classic/find_element_from_element/find.py @@ -69,7 +69,7 @@ def test_no_such_element_with_startnode_from_other_window_handle(session, inline def test_no_such_element_with_startnode_from_other_frame(session, iframe, inline): session.url = inline(iframe("<div id='parent'><p/>")) - session.switch_frame(0) + session.switch_to_frame(0) from_element = session.find.css("#parent", all=False) session.switch_to_parent_frame() diff --git a/testing/web-platform/tests/webdriver/tests/classic/find_element_from_shadow_root/find.py b/testing/web-platform/tests/webdriver/tests/classic/find_element_from_shadow_root/find.py @@ -70,7 +70,7 @@ def test_no_such_shadow_root_with_shadow_root_from_other_frame( session, get_test_page ): session.url = get_test_page(as_frame=True) - session.switch_frame(0) + session.switch_to_frame(0) host = session.find.css("custom-element", all=False) shadow_root = host.shadow_root @@ -87,7 +87,7 @@ def test_detached_shadow_root(session, get_test_page, as_frame): if as_frame: frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) host = session.find.css("custom-element", all=False) shadow_root = host.shadow_root diff --git a/testing/web-platform/tests/webdriver/tests/classic/find_elements_from_element/find.py b/testing/web-platform/tests/webdriver/tests/classic/find_elements_from_element/find.py @@ -70,7 +70,7 @@ def test_no_such_element_with_startnode_from_other_window_handle(session, inline def test_no_such_element_with_startnode_from_other_frame(session, iframe, inline): session.url = inline(iframe("<div id='parent'><p/>")) - session.switch_frame(0) + session.switch_to_frame(0) from_element = session.find.css("#parent", all=False) session.switch_to_parent_frame() diff --git a/testing/web-platform/tests/webdriver/tests/classic/find_elements_from_shadow_root/find.py b/testing/web-platform/tests/webdriver/tests/classic/find_elements_from_shadow_root/find.py @@ -70,7 +70,7 @@ def test_no_such_shadow_root_with_shadow_root_from_other_frame( session, get_test_page ): session.url = get_test_page(as_frame=True) - session.switch_frame(0) + session.switch_to_frame(0) host = session.find.css("custom-element", all=False) shadow_root = host.shadow_root @@ -87,7 +87,7 @@ def test_detached_shadow_root(session, get_test_page, as_frame): if as_frame: frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) host = session.find.css("custom-element", all=False) shadow_root = host.shadow_root diff --git a/testing/web-platform/tests/webdriver/tests/classic/forward/forward.py b/testing/web-platform/tests/webdriver/tests/classic/forward/forward.py @@ -168,7 +168,7 @@ def test_removed_iframe(session, url, inline): session.back() subframe = session.find.css("#sub-frame", all=False) - session.switch_frame(subframe) + session.switch_to_frame(subframe) response = forward(session) assert_success(response) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_computed_label/get.py b/testing/web-platform/tests/webdriver/tests/classic/get_computed_label/get.py @@ -54,7 +54,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_computed_role/get.py b/testing/web-platform/tests/webdriver/tests/classic/get_computed_role/get.py @@ -54,7 +54,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_current_url/iframe.py b/testing/web-platform/tests/webdriver/tests/classic/get_current_url/iframe.py @@ -40,7 +40,7 @@ def test_iframe(session, one_frame_doc): session.url = top_level_doc frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) session.find.css("p", all=False) response = get_current_url(session) @@ -52,10 +52,10 @@ def test_nested_iframe(session, nested_frames_doc): top_level_doc = session.url outer_frame = session.find.css("iframe", all=False) - session.switch_frame(outer_frame) + session.switch_to_frame(outer_frame) inner_frame = session.find.css("iframe", all=False) - session.switch_frame(inner_frame) + session.switch_to_frame(inner_frame) session.find.css("p", all=False) response = get_current_url(session) @@ -68,7 +68,7 @@ def test_origin(session, inline, iframe, domain): session.url = top_level_doc frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) session.find.css("p", all=False) response = get_current_url(session) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_element_attribute/get.py b/testing/web-platform/tests/webdriver/tests/classic/get_element_attribute/get.py @@ -66,7 +66,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_element_css_value/get.py b/testing/web-platform/tests/webdriver/tests/classic/get_element_css_value/get.py @@ -70,7 +70,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_element_property/get.py b/testing/web-platform/tests/webdriver/tests/classic/get_element_property/get.py @@ -67,7 +67,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_element_rect/get.py b/testing/web-platform/tests/webdriver/tests/classic/get_element_rect/get.py @@ -70,7 +70,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_element_shadow_root/get.py b/testing/web-platform/tests/webdriver/tests/classic/get_element_shadow_root/get.py @@ -57,7 +57,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_element_tag_name/get.py b/testing/web-platform/tests/webdriver/tests/classic/get_element_tag_name/get.py @@ -66,7 +66,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_element_text/get.py b/testing/web-platform/tests/webdriver/tests/classic/get_element_text/get.py @@ -66,7 +66,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/get_title/iframe.py b/testing/web-platform/tests/webdriver/tests/classic/get_title/iframe.py @@ -46,7 +46,7 @@ def test_iframe(session, one_frame_doc): session.url = one_frame_doc frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) session.find.css("p", all=False) response = get_title(session) @@ -57,10 +57,10 @@ def test_nested_iframe(session, nested_frames_doc): session.url = nested_frames_doc outer_frame = session.find.css("iframe", all=False) - session.switch_frame(outer_frame) + session.switch_to_frame(outer_frame) inner_frame = session.find.css("iframe", all=False) - session.switch_frame(inner_frame) + session.switch_to_frame(inner_frame) session.find.css("p", all=False) response = get_title(session) @@ -73,7 +73,7 @@ def test_origin(session, inline, iframe, domain): iframe("<title>bar</title><p>frame", domain=domain))) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) session.find.css("p", all=False) response = get_title(session) diff --git a/testing/web-platform/tests/webdriver/tests/classic/is_element_enabled/enabled.py b/testing/web-platform/tests/webdriver/tests/classic/is_element_enabled/enabled.py @@ -61,7 +61,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("input#text", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/is_element_selected/selected.py b/testing/web-platform/tests/webdriver/tests/classic/is_element_selected/selected.py @@ -85,7 +85,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("input#text", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py b/testing/web-platform/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py @@ -296,7 +296,7 @@ def test_move_to_origin_position_within_frame( ) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) elem = session.find.css("input", all=False) elem_center_point = center_point(elem) diff --git a/testing/web-platform/tests/webdriver/tests/classic/refresh/refresh.py b/testing/web-platform/tests/webdriver/tests/classic/refresh/refresh.py @@ -98,7 +98,7 @@ def test_history_pushstate(session, inline): def test_refresh_switches_to_parent_browsing_context(session, create_frame, inline): session.url = inline("<div id=foo>") - session.switch_frame(create_frame()) + session.switch_to_frame(create_frame()) with pytest.raises(error.NoSuchElementException): session.find.css("#foo", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/switch_to_frame/switch.py b/testing/web-platform/tests/webdriver/tests/classic/switch_to_frame/switch.py @@ -42,7 +42,7 @@ def test_no_top_browsing_context(session, url, id): session.url = url("/webdriver/tests/support/html/frames.html") subframe = session.find.css("#sub-frame", all=False) - session.switch_frame(subframe) + session.switch_to_frame(subframe) session.window.close() @@ -88,11 +88,11 @@ def test_frame_id_null(session, inline, iframe): session.url = inline(iframe("{}<div>foo".format(iframe("<p>bar")))) frame1 = session.find.css("iframe", all=False) - session.switch_frame(frame1) + session.switch_to_frame(frame1) element1 = session.find.css("div", all=False) frame2 = session.find.css("iframe", all=False) - session.switch_frame(frame2) + session.switch_to_frame(frame2) element2 = session.find.css("p", all=False) # Switch to top-level browsing context @@ -118,7 +118,7 @@ def test_find_element_while_frame_is_still_loading(session, url): "document.documentElement.innerHTML = arguments[0];", args=[page_url]) frame1 = session.find.css("iframe", all=False) - session.switch_frame(frame1) + session.switch_to_frame(frame1) # Ensure that the is always a valid browsing context, and the element # can be found eventually. diff --git a/testing/web-platform/tests/webdriver/tests/classic/switch_to_parent_frame/switch.py b/testing/web-platform/tests/webdriver/tests/classic/switch_to_parent_frame/switch.py @@ -13,7 +13,7 @@ def switch_to_parent_frame(session): def test_null_response_value(session, inline, iframe): session.url = inline(iframe("<p>foo")) frame_element = session.find.css("iframe", all=False) - session.switch_frame(frame_element) + session.switch_to_frame(frame_element) response = switch_to_parent_frame(session) value = assert_success(response) @@ -26,7 +26,7 @@ def test_no_top_browsing_context(session, url): session.url = url("/webdriver/tests/support/html/frames.html") subframe = session.find.css("#sub-frame", all=False) - session.switch_frame(subframe) + session.switch_to_frame(subframe) session.window.close() @@ -49,7 +49,7 @@ def test_no_browsing_context_when_already_top_level(session, closed_window): def test_switch_from_iframe(session, inline, iframe): session.url = inline(iframe("<p>foo")) frame_element = session.find.css("iframe", all=False) - session.switch_frame(frame_element) + session.switch_to_frame(frame_element) element = session.find.css("p", all=False) result = switch_to_parent_frame(session) diff --git a/testing/web-platform/tests/webdriver/tests/classic/switch_to_window/switch.py b/testing/web-platform/tests/webdriver/tests/classic/switch_to_window/switch.py @@ -42,10 +42,10 @@ def test_no_browsing_context(session, url): session.url = url("/webdriver/tests/support/html/frames.html") subframe = session.find.css("#sub-frame", all=False) - session.switch_frame(subframe) + session.switch_to_frame(subframe) deleteframe = session.find.css("#delete-frame", all=False) - session.switch_frame(deleteframe) + session.switch_to_frame(deleteframe) button = session.find.css("#remove-parent", all=False) button.click() @@ -60,7 +60,7 @@ def test_switch_to_window_sets_top_level_context(session, inline, iframe): session.url = inline(iframe("<p>foo")) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) session.find.css("p", all=False) response = switch_to_window(session, session.window_handle) diff --git a/testing/web-platform/tests/webdriver/tests/classic/take_element_screenshot/iframe.py b/testing/web-platform/tests/webdriver/tests/classic/take_element_screenshot/iframe.py @@ -73,7 +73,7 @@ def test_frame_element(session, inline, iframe): session.url = inline("""{0}{1}""".format(OUTER_IFRAME_STYLE, iframe(iframe_content))) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) div = session.find.css("div", all=False) div_dimensions = element_dimensions(session, div) assert div_dimensions == ref_dimensions diff --git a/testing/web-platform/tests/webdriver/tests/classic/take_element_screenshot/screenshot.py b/testing/web-platform/tests/webdriver/tests/classic/take_element_screenshot/screenshot.py @@ -59,7 +59,7 @@ def test_no_such_element_from_other_frame(session, get_test_page, closed): session.url = get_test_page(as_frame=True) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) element = session.find.css("div", all=False) diff --git a/testing/web-platform/tests/webdriver/tests/classic/take_screenshot/iframe.py b/testing/web-platform/tests/webdriver/tests/classic/take_screenshot/iframe.py @@ -26,7 +26,7 @@ def test_always_captures_top_browsing_context(session, inline, iframe): assert png_dimensions(reference_screenshot) == viewport_dimensions(session) frame = session.find.css("iframe", all=False) - session.switch_frame(frame) + session.switch_to_frame(frame) response = take_screenshot(session) screenshot = assert_success(response) diff --git a/testing/web-platform/tests/webdriver/tests/interop/frames.py b/testing/web-platform/tests/webdriver/tests/interop/frames.py @@ -13,10 +13,10 @@ async def test_classic_switch_to_parent_no_browsing_context(bidi_session, curren current_session.url = url("/webdriver/tests/support/html/frames.html") subframe = current_session.find.css("#sub-frame", all=False) - current_session.switch_frame(subframe) + current_session.switch_to_frame(subframe) deleteframe = current_session.find.css("#delete-frame", all=False) - current_session.switch_frame(deleteframe) + current_session.switch_to_frame(deleteframe) button = current_session.find.css("#remove-top", all=False) button.click() diff --git a/testing/web-platform/tests/webdriver/tests/support/fixtures_http.py b/testing/web-platform/tests/webdriver/tests/support/fixtures_http.py @@ -43,10 +43,10 @@ def closed_frame(session, url): session.url = url("/webdriver/tests/support/html/frames.html") subframe = session.find.css("#sub-frame", all=False) - session.switch_frame(subframe) + session.switch_to_frame(subframe) deleteframe = session.find.css("#delete-frame", all=False) - session.switch_frame(deleteframe) + session.switch_to_frame(deleteframe) button = session.find.css("#remove-parent", all=False) button.click() @@ -188,7 +188,7 @@ def stale_element(current_session, get_test_page): if as_frame: frame = current_session.find.css("iframe", all=False) - current_session.switch_frame(frame) + current_session.switch_to_frame(frame) element = current_session.find.css(css_value, all=False) shadow_root = element.shadow_root if want_shadow_root else None diff --git a/testing/web-platform/tests/webdriver/tests/support/helpers.py b/testing/web-platform/tests/webdriver/tests/support/helpers.py @@ -97,7 +97,7 @@ def _switch_to_top_level_browsing_context(session): `<frame>` or an `<iframe>`, switch it back to the top-level browsing context. """ - session.switch_frame(None) + session.switch_to_frame(None) def _windows(session, exclude=None):