[wdspec] change test_..._closes_browsing_context (#49759)

Open context with `window.open` to allow it to be closed by script.
web-platform-tests · Dec 18, 2024 · 16e6fbc · 16e6fbc
1 parent 7d9676e
commit 16e6fbc
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 27 deletions.
diff --git a/webdriver/tests/bidi/input/perform_actions/key.py b/webdriver/tests/bidi/input/perform_actions/key.py
@@ -10,6 +10,8 @@
 
 pytestmark = pytest.mark.asyncio
 
+CONTEXT_LOAD_EVENT = "browsingContext.load"
+
 
 async def test_invalid_browsing_context(bidi_session):
     actions = Actions()
@@ -20,18 +22,26 @@ async def test_invalid_browsing_context(bidi_session):
 
 
 async def test_key_down_closes_browsing_context(
-    bidi_session, configuration, new_tab, inline
+    bidi_session, configuration, new_tab, inline, subscribe_events,
+    wait_for_event
 ):
     url = inline("""
         <input onkeydown="window.close()">close</input>
         <script>document.querySelector("input").focus();</script>
         """)
 
-    await bidi_session.browsing_context.navigate(
-        context=new_tab["context"],
-        url=url,
-        wait="complete",
+    # Opening a new context via `window.open` is required for script to be able
+    # to close it.
+    await subscribe_events(events=[CONTEXT_LOAD_EVENT])
+    on_load = wait_for_event(CONTEXT_LOAD_EVENT)
+
+    await bidi_session.script.evaluate(
+        expression=f"window.open('{url}')",
+        target=ContextTarget(new_tab["context"]),
+        await_promise=True
     )
+    # Wait for the new context to be created and get it.
+    new_context = await on_load
 
     actions = Actions()
     (
@@ -43,7 +53,7 @@ async def test_key_down_closes_browsing_context(
 
     with pytest.raises(NoSuchFrameException):
         await bidi_session.input.perform_actions(
-            actions=actions, context=new_tab["context"]
+            actions=actions, context=new_context["context"]
         )
 
 

diff --git a/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py b/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py
@@ -2,6 +2,7 @@
 
 from webdriver.bidi.error import MoveTargetOutOfBoundsException, NoSuchFrameException
 from webdriver.bidi.modules.input import Actions, get_element_origin
+from webdriver.bidi.modules.script import ContextTarget
 
 from tests.support.asserts import assert_move_to_coordinates
 from tests.support.helpers import filter_dict
@@ -16,18 +17,29 @@
 
 pytestmark = pytest.mark.asyncio
 
+CONTEXT_LOAD_EVENT = "browsingContext.load"
+
 
 async def test_pointer_down_closes_browsing_context(
-    bidi_session, configuration, get_element, new_tab, inline
+    bidi_session, configuration, get_element, new_tab, inline, subscribe_events,
+    wait_for_event
 ):
     url = inline("""<input onpointerdown="window.close()">close</input>""")
-    await bidi_session.browsing_context.navigate(
-        context=new_tab["context"],
-        url=url,
-        wait="complete",
+
+    # Opening a new context via `window.open` is required for script to be able
+    # to close it.
+    await subscribe_events(events=[CONTEXT_LOAD_EVENT])
+    on_load = wait_for_event(CONTEXT_LOAD_EVENT)
+
+    await bidi_session.script.evaluate(
+        expression=f"window.open('{url}')",
+        target=ContextTarget(new_tab["context"]),
+        await_promise=True
     )
+    # Wait for the new context to be created and get it.
+    new_context = await on_load
 
-    element = await get_element("input", context=new_tab)
+    element = await get_element("input", context=new_context)
     origin = get_element_origin(element)
 
     actions = Actions()
@@ -41,7 +53,7 @@ async def test_pointer_down_closes_browsing_context(
 
     with pytest.raises(NoSuchFrameException):
         await bidi_session.input.perform_actions(
-            actions=actions, context=new_tab["context"]
+            actions=actions, context=new_context["context"]
         )
 
 

diff --git a/webdriver/tests/bidi/input/perform_actions/pointer_pen.py b/webdriver/tests/bidi/input/perform_actions/pointer_pen.py
@@ -2,6 +2,7 @@
 
 from webdriver.bidi.error import MoveTargetOutOfBoundsException, NoSuchFrameException
 from webdriver.bidi.modules.input import Actions, get_element_origin
+from webdriver.bidi.modules.script import ContextTarget
 
 from .. import get_events
 from . import (
@@ -13,18 +14,29 @@
 
 pytestmark = pytest.mark.asyncio
 
+CONTEXT_LOAD_EVENT = "browsingContext.load"
+
 
 async def test_pointer_down_closes_browsing_context(
-    bidi_session, configuration, get_element, new_tab, inline
+    bidi_session, configuration, get_element, new_tab, inline, subscribe_events,
+    wait_for_event
 ):
     url = inline("""<input onpointerdown="window.close()">close</input>""")
-    await bidi_session.browsing_context.navigate(
-        context=new_tab["context"],
-        url=url,
-        wait="complete",
+
+    # Opening a new context via `window.open` is required for script to be able
+    # to close it.
+    await subscribe_events(events=[CONTEXT_LOAD_EVENT])
+    on_load = wait_for_event(CONTEXT_LOAD_EVENT)
+
+    await bidi_session.script.evaluate(
+        expression=f"window.open('{url}')",
+        target=ContextTarget(new_tab["context"]),
+        await_promise=True
     )
+    # Wait for the new context to be created and get it.
+    new_context = await on_load
 
-    element = await get_element("input", context=new_tab)
+    element = await get_element("input", context=new_context)
     origin = get_element_origin(element)
 
     actions = Actions()
@@ -38,7 +50,7 @@ async def test_pointer_down_closes_browsing_context(
 
     with pytest.raises(NoSuchFrameException):
         await bidi_session.input.perform_actions(
-            actions=actions, context=new_tab["context"]
+            actions=actions, context=new_context["context"]
         )
 
 

diff --git a/webdriver/tests/bidi/input/perform_actions/pointer_touch.py b/webdriver/tests/bidi/input/perform_actions/pointer_touch.py
@@ -2,6 +2,7 @@
 
 from webdriver.bidi.error import MoveTargetOutOfBoundsException, NoSuchFrameException
 from webdriver.bidi.modules.input import Actions, get_element_origin
+from webdriver.bidi.modules.script import ContextTarget
 
 from .. import get_events
 from . import (
@@ -13,18 +14,29 @@
 
 pytestmark = pytest.mark.asyncio
 
+CONTEXT_LOAD_EVENT = "browsingContext.load"
+
 
 async def test_pointer_down_closes_browsing_context(
-    bidi_session, configuration, get_element, new_tab, inline
+    bidi_session, configuration, get_element, new_tab, inline, subscribe_events,
+    wait_for_event
 ):
     url = inline("""<input onpointerdown="window.close()">close</input>""")
-    await bidi_session.browsing_context.navigate(
-        context=new_tab["context"],
-        url=url,
-        wait="complete",
+
+    # Opening a new context via `window.open` is required for script to be able
+    # to close it.
+    await subscribe_events(events=[CONTEXT_LOAD_EVENT])
+    on_load = wait_for_event(CONTEXT_LOAD_EVENT)
+
+    await bidi_session.script.evaluate(
+        expression=f"window.open('{url}')",
+        target=ContextTarget(new_tab["context"]),
+        await_promise=True
     )
+    # Wait for the new context to be created and get it.
+    new_context = await on_load
 
-    element = await get_element("input", context=new_tab)
+    element = await get_element("input", context=new_context)
     origin = get_element_origin(element)
 
     actions = Actions()
@@ -38,7 +50,7 @@ async def test_pointer_down_closes_browsing_context(
 
     with pytest.raises(NoSuchFrameException):
         await bidi_session.input.perform_actions(
-            actions=actions, context=new_tab["context"]
+            actions=actions, context=new_context["context"]
         )