Skip to content

Commit d927799

Browse files
juliandescottesmoz-wptsync-bot
authored andcommitted
Bug 1985608 [wpt PR 54552] - wdspec: fix navigate relative_url test to use a relative url, a=testonly
Automatic update from web-platform-tests wdspec: fix navigate relative_url test to use a relative url -- wpt-commits: 1ebd4ad69513453e7fc65571bd6b23e8c804290e wpt-pr: 54552
1 parent 3dfc233 commit d927799

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

testing/web-platform/tests/webdriver/tests/bidi/browsing_context/navigate/__init__.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
from ... import any_string
66

77

8-
async def navigate_and_assert(bidi_session, context, url, wait="complete", expected_error=False):
8+
async def navigate_and_assert(
9+
bidi_session, context, url, wait="complete", expected_error=False, expected_url=None
10+
):
11+
if expected_url is None:
12+
expected_url = url
13+
914
if expected_error:
1015
with pytest.raises(UnknownErrorException):
1116
await bidi_session.browsing_context.navigate(
@@ -16,13 +21,13 @@ async def navigate_and_assert(bidi_session, context, url, wait="complete", expec
1621
result = await bidi_session.browsing_context.navigate(
1722
context=context['context'], url=url, wait=wait
1823
)
19-
assert result["url"] == url
24+
assert result["url"] == expected_url
2025
any_string(result["navigation"])
2126

2227
contexts = await bidi_session.browsing_context.get_tree(
2328
root=context['context']
2429
)
2530
assert len(contexts) == 1
26-
assert contexts[0]["url"] == url
31+
assert contexts[0]["url"] == expected_url
2732

2833
return contexts

testing/web-platform/tests/webdriver/tests/bidi/browsing_context/navigate/navigate.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,22 +81,23 @@ async def test_interactive_simultaneous_navigation(bidi_session, wait_for_future
8181

8282

8383
async def test_relative_url(bidi_session, new_tab, url):
84-
url_before = url(
85-
"/webdriver/tests/bidi/browsing_context/support/empty.html"
86-
)
84+
url_before = url("/webdriver/tests/bidi/browsing_context/support/empty.html")
8785

88-
await navigate_and_assert(bidi_session, new_tab, url_before, "none")
86+
await navigate_and_assert(bidi_session, new_tab, url_before, wait="none")
8987

90-
url_after = url_before.replace("empty.html", "other.html")
91-
await navigate_and_assert(bidi_session, new_tab, url_after, "none")
88+
relative_url = "other.html"
89+
url_after = url_before.replace("empty.html", relative_url)
90+
await navigate_and_assert(
91+
bidi_session, new_tab, relative_url, wait="none", expected_url=url_after
92+
)
9293

9394

9495
async def test_same_document_navigation_in_before_unload(bidi_session, new_tab, url):
9596
url_before = url(
9697
"/webdriver/tests/bidi/browsing_context/support/empty.html"
9798
)
9899

99-
await navigate_and_assert(bidi_session, new_tab, url_before, "complete")
100+
await navigate_and_assert(bidi_session, new_tab, url_before, wait="complete")
100101

101102
await bidi_session.script.evaluate(
102103
expression="""window.addEventListener(
@@ -108,7 +109,7 @@ async def test_same_document_navigation_in_before_unload(bidi_session, new_tab,
108109
await_promise=False)
109110

110111
url_after = url_before.replace("empty.html", "other.html")
111-
await navigate_and_assert(bidi_session, new_tab, url_after, "complete")
112+
await navigate_and_assert(bidi_session, new_tab, url_after, wait="complete")
112113

113114

114115
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)