[wdspec] align navigation tests with spec

Align WebDriver BiDi spec tests with the breaking change in navigation wait logic: w3c/webdriver-bidi#855.

Author: sadym-chromium

webdriver/tests/bidi/browsing_context/navigate/navigate.py

@@ -8,6 +8,8 @@
 
 pytestmark = pytest.mark.asyncio
 
+USER_PROMPT_OPENED_EVENT = "browsingContext.userPromptOpened"
+
 
 async def test_payload(bidi_session, inline, new_tab):
     url = inline("<div>foo</div>")
@@ -81,12 +83,10 @@ async def test_relative_url(bidi_session, new_tab, url):
         "/webdriver/tests/bidi/browsing_context/support/empty.html"
     )
 
-    # Navigate to page1 with wait=interactive to make sure the document's base URI
-    # was updated.
-    await navigate_and_assert(bidi_session, new_tab, url_before, "interactive")
+    await navigate_and_assert(bidi_session, new_tab, url_before, "none")
 
     url_after = url_before.replace("empty.html", "other.html")
-    await navigate_and_assert(bidi_session, new_tab, url_after, "interactive")
+    await navigate_and_assert(bidi_session, new_tab, url_after, "none")
 
 
 async def test_same_document_navigation_in_before_unload(bidi_session, new_tab, url):
@@ -110,25 +110,44 @@ async def test_same_document_navigation_in_before_unload(bidi_session, new_tab,
 
 
 @pytest.mark.capabilities({"unhandledPromptBehavior": {'beforeUnload': 'ignore'}})
-async def test_wait_none_with_beforeunload_prompt(
-    bidi_session, new_tab, setup_beforeunload_page, inline
-):
+@pytest.mark.parametrize("value", ["none", "interactive", "complete"])
+@pytest.mark.parametrize("accept", [True, False])
+async def test_navigate_with_beforeunload_prompt(bidi_session, new_tab,
+        setup_beforeunload_page, inline, subscribe_events, wait_for_event,
+        wait_for_future_safe, value, accept):
     await setup_beforeunload_page(new_tab)
 
+    await subscribe_events(events=[USER_PROMPT_OPENED_EVENT])
+    on_prompt_opened = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
     url_after = inline("<div>foo</div>")
 
-    result = await bidi_session.browsing_context.navigate(
-        context=new_tab["context"], url=url_after, wait="none"
+    navigated_future = asyncio.create_task(
+        bidi_session.browsing_context.navigate(context=new_tab["context"],
+                                               url=url_after, wait=value))
+
+    # Wait for the prompt to open.
+    await wait_for_future_safe(on_prompt_opened)
+    # Make sure the navigation is not finished.
+    assert not navigated_future.done()
+
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=new_tab["context"], accept=accept
     )
 
-    assert result["url"] == url_after
-    any_string(result["navigation"])
+    if accept:
+        await navigated_future
+    else:
+        with pytest.raises(error.UnknownErrorException):
+            await wait_for_future_safe(navigated_future)
 
 
 @pytest.mark.capabilities({"unhandledPromptBehavior": {'beforeUnload': 'ignore'}})
-async def test_wait_none_with_beforeunload_prompt_in_iframe(
-    bidi_session, new_tab, setup_beforeunload_page, inline
-):
+@pytest.mark.parametrize("value", ["none", "interactive", "complete"])
+@pytest.mark.parametrize("accept", [True, False])
+async def test_navigate_with_beforeunload_prompt_in_iframe(bidi_session,
+        new_tab, setup_beforeunload_page, inline, subscribe_events,
+        wait_for_event, wait_for_future_safe, value, accept):
     page = inline(f"""<iframe src={inline("foo")}></iframe>""")
     await bidi_session.browsing_context.navigate(
         context=new_tab["context"], url=page, wait="complete"
@@ -139,35 +158,69 @@ async def test_wait_none_with_beforeunload_prompt_in_iframe(
 
     await setup_beforeunload_page(iframe_context)
 
+    await subscribe_events(events=[USER_PROMPT_OPENED_EVENT])
+    on_prompt_opened = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
     url_after = inline("<div>foo</div>")
 
-    result = await bidi_session.browsing_context.navigate(
-        context=iframe_context["context"], url=url_after, wait="none"
+    navigated_future = asyncio.create_task(
+        bidi_session.browsing_context.navigate(
+            context=iframe_context["context"], url=url_after, wait=value))
+
+    # Wait for the prompt to open.
+    await wait_for_future_safe(on_prompt_opened)
+    # Make sure the navigation is not finished.
+    assert not navigated_future.done()
+
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=new_tab["context"], accept=accept
     )
 
-    assert result["url"] == url_after
-    any_string(result["navigation"])
+    if accept:
+        await navigated_future
+    else:
+        with pytest.raises(error.UnknownErrorException):
+            await wait_for_future_safe(navigated_future)
 
 
 @pytest.mark.capabilities({"unhandledPromptBehavior": {'beforeUnload': 'ignore'}})
-async def test_wait_none_with_beforeunload_prompt_in_iframe_navigate_in_top_context(
-    bidi_session, new_tab, setup_beforeunload_page, inline
-):
+@pytest.mark.parametrize("value", ["none", "interactive", "complete"])
+@pytest.mark.parametrize("accept", [True, False])
+async def test_navigate_with_beforeunload_prompt_in_iframe_navigate_in_top_context(
+        bidi_session, new_tab, setup_beforeunload_page, inline,
+        subscribe_events, wait_for_event, wait_for_future_safe, value, accept):
     page = inline(f"""<iframe src={inline("foo")}></iframe>""")
     await bidi_session.browsing_context.navigate(
         context=new_tab["context"], url=page, wait="complete"
     )
 
-    contexts = await bidi_session.browsing_context.get_tree(root=new_tab["context"])
+    contexts = await bidi_session.browsing_context.get_tree(
+        root=new_tab["context"])
     iframe_context = contexts[0]["children"][0]
 
     await setup_beforeunload_page(iframe_context)
 
+    await subscribe_events(events=[USER_PROMPT_OPENED_EVENT])
+    on_prompt_opened = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
     url_after = inline("<div>foo</div>")
 
-    result = await bidi_session.browsing_context.navigate(
-        context=new_tab["context"], url=url_after, wait="none"
+    navigated_future = asyncio.create_task(
+        bidi_session.browsing_context.navigate(
+            context=new_tab["context"], url=url_after, wait=value
+        ))
+
+    # Wait for the prompt to open.
+    await wait_for_future_safe(on_prompt_opened)
+    # Make sure the navigation is not finished.
+    assert not navigated_future.done()
+
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=new_tab["context"], accept=accept
     )
 
-    assert result["url"] == url_after
-    any_string(result["navigation"])
+    if accept:
+        await navigated_future
+    else:
+        with pytest.raises(error.UnknownErrorException):
+            await wait_for_future_safe(navigated_future)

webdriver/tests/bidi/browsing_context/navigate/wait.py

@@ -1,8 +1,13 @@
 import pytest
 import asyncio
 
+import webdriver.bidi.error as error
+
+
 pytestmark = pytest.mark.asyncio
 
+USER_PROMPT_OPENED_EVENT = "browsingContext.userPromptOpened"
+
 
 async def wait_for_navigation(bidi_session, context, url, wait, expect_timeout):
     # Ultimately, "interactive" and "complete" should support a timeout argument.
@@ -28,11 +33,9 @@ async def test_expected_url(bidi_session, inline, new_tab, value):
         context=new_tab["context"], url=url, wait=value
     )
     assert result["url"] == url
-    if value != "none":
-        contexts = await bidi_session.browsing_context.get_tree(
-            root=new_tab["context"], max_depth=0
-        )
-        assert contexts[0]["url"] == url
+    contexts = await bidi_session.browsing_context.get_tree(
+        root=new_tab["context"], max_depth=0)
+    assert contexts[0]["url"] == url
 
 
 @pytest.mark.parametrize(
@@ -49,10 +52,10 @@ async def test_slow_image_blocks_load(bidi_session, inline, new_tab, wait, expec
 
     await wait_for_navigation(bidi_session, new_tab["context"], url, wait, expect_timeout)
 
-    # We cannot assert the URL for "none" by definition, and for "complete", since
-    # we expect a timeout. For the timeout case, the wait_for_navigation helper will
-    # resume  after 1 second, there is no guarantee that the URL has been updated.
-    if wait == "interactive":
+    # We cannot assert the URL for "complete", since we expect a timeout. For
+    # this case, the wait_for_navigation helper will resume  after 1 second,
+    # there is no guarantee that the URL has been updated.
+    if wait != "complete":
         contexts = await bidi_session.browsing_context.get_tree(
             root=new_tab["context"], max_depth=0
         )

webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py

@@ -440,14 +440,16 @@ async def test_with_beforeunload_prompt(
     target_url = url("/webdriver/tests/support/html/default.html", domain="alt")
 
     on_navigation_started = wait_for_event(NAVIGATION_STARTED_EVENT)
-    result = await bidi_session.browsing_context.navigate(
+
+    # Trigger navigation, but don't wait for it to be finished. Needed to be run
+    # in a task.
+    asyncio.create_task(bidi_session.browsing_context.navigate(
         context=new_tab["context"], url=target_url, wait="none"
-    )
+    ))
 
     event = await wait_for_future_safe(on_navigation_started)
 
     assert event["context"] == new_tab["context"]
-    assert event["navigation"] == result["navigation"]
     assert event["url"] == target_url
 
 

webdriver/tests/bidi/browsing_context/reload/wait.py

@@ -38,13 +38,12 @@ async def test_expected_url(bidi_session, inline, new_tab, wait):
         wait=wait
     )
 
-    if wait != "none":
-        assert reload_result["navigation"] != navigate_result["navigation"]
-        assert reload_result["url"] == url
+    assert reload_result["navigation"] != navigate_result["navigation"]
+    assert reload_result["url"] == url
 
-        contexts = await bidi_session.browsing_context.get_tree(
-            root=new_tab["context"], max_depth=0)
-        assert contexts[0]["url"] == url
+    contexts = await bidi_session.browsing_context.get_tree(
+        root=new_tab["context"], max_depth=0)
+    assert contexts[0]["url"] == url
 
 
 @pytest.mark.parametrize(
@@ -68,10 +67,10 @@ async def test_slow_image_blocks_load(bidi_session, inline, new_tab, wait,
     await wait_for_reload(bidi_session, new_tab["context"], wait,
                           expect_timeout)
 
-    # We cannot assert the URL for "none" by definition, and for "complete", since
-    # we expect a timeout. For the timeout case, the wait_for_navigation helper will
-    # resume after 1 second, there is no guarantee that the URL has been updated.
-    if wait == "interactive":
+    # We cannot assert the URL for "complete", since we expect a timeout. For
+    # this case, the wait_for_navigation helper will resume after 1 second,
+    # there is no guarantee that the URL has been updated.
+    if wait != "complete":
         contexts = await bidi_session.browsing_context.get_tree(
             root=new_tab["context"], max_depth=0)
         assert contexts[0]["url"] == url

webdriver/tests/bidi/network/fetch_error/fetch_error.py

@@ -152,19 +152,16 @@ async def test_navigation_id(
     assert fetch_error_event["navigation"] is None
 
     on_fetch_error = wait_for_event(FETCH_ERROR_EVENT)
-    result = await bidi_session.browsing_context.navigate(
+    asyncio.ensure_future(bidi_session.browsing_context.navigate(
         context=new_tab["context"],
-        url=PAGE_INVALID_URL,
-    )
+        url=PAGE_INVALID_URL))
     fetch_error_event = await wait_for_future_safe(on_fetch_error)
 
     expected_request = {"method": "GET", "url": PAGE_INVALID_URL}
     assert_fetch_error_event(
         fetch_error_event,
         expected_request=expected_request,
-        navigation=result["navigation"],
     )
-    assert fetch_error_event["navigation"] == result["navigation"]
 
 
 @pytest.mark.parametrize(
@@ -303,7 +300,7 @@ async def test_redirect_fetch(
 
 @pytest.mark.asyncio
 async def test_redirect_navigation(
-    bidi_session, new_tab, wait_for_event, url, setup_network_test
+        bidi_session, new_tab, wait_for_event, url, setup_network_test
 ):
     redirect_url = url(
         f"/webdriver/tests/support/http_handlers/redirect.py?location={PAGE_INVALID_URL}"
@@ -320,10 +317,10 @@ async def test_redirect_navigation(
     on_fetch_error = wait_for_event(FETCH_ERROR_EVENT)
     on_response_completed = wait_for_event(RESPONSE_COMPLETED_EVENT)
 
-    result = await bidi_session.browsing_context.navigate(
+    asyncio.ensure_future(bidi_session.browsing_context.navigate(
         context=new_tab["context"],
         url=redirect_url,
-    )
+    ))
 
     wait = AsyncPoll(bidi_session, timeout=2)
     fetch_error_event = await on_fetch_error
@@ -333,19 +330,17 @@ async def test_redirect_navigation(
     assert_response_event(
         response_completed_event,
         expected_request=expected_request,
-        navigation=result["navigation"],
         redirect_count=0,
     )
     expected_request = {"method": "GET", "url": PAGE_INVALID_URL}
     assert_fetch_error_event(
         fetch_error_event,
         expected_request=expected_request,
-        navigation=result["navigation"],
         redirect_count=1,
     )
 
     # Check that all events share the same requestId
     assert (
-        fetch_error_event["request"]["request"]
-        == response_completed_event["request"]["request"]
+            fetch_error_event["request"]["request"]
+            == response_completed_event["request"]["request"]
     )