Skip to content

Commit 139bf3b

Browse files
authored
Merge branch 'trunk' into type-annotation-errors
2 parents 1209a02 + ca3b7cf commit 139bf3b

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

MODULE.bazel

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ bazel_dep(name = "rules_cc", version = "0.2.0", dev_dependency = True)
1919

2020
bazel_dep(name = "rules_dotnet", version = "0.17.5")
2121
bazel_dep(name = "rules_java", version = "8.7.1")
22-
bazel_dep(name = "rules_jvm_external", version = "6.6")
22+
bazel_dep(name = "rules_jvm_external", version = "6.8")
2323
bazel_dep(name = "rules_multitool", version = "1.3.0")
2424
bazel_dep(name = "rules_nodejs", version = "6.3.2")
2525
bazel_dep(name = "rules_oci", version = "1.8.0")
@@ -29,12 +29,10 @@ bazel_dep(name = "rules_proto", version = "7.0.2")
2929
bazel_dep(name = "rules_ruby", version = "0.19.0")
3030

3131
# Until `rules_jvm_external` 6.8 ships
32-
git_override(
32+
single_version_override(
3333
module_name = "rules_jvm_external",
34-
commit = "aca619b117c1fe306ffdd20c5f47cc4dbd5effed",
3534
patch_strip = 1,
3635
patches = ["//java:rules_jvm_external_javadoc.patch"],
37-
remote = "https://github.com/bazel-contrib/rules_jvm_external.git",
3836
)
3937

4038
multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")

py/test/selenium/webdriver/common/bidi_browsing_context_tests.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -756,9 +756,6 @@ def on_user_prompt_closed(info):
756756
driver.browsing_context.remove_event_handler("user_prompt_closed", callback_id)
757757

758758

759-
@pytest.mark.xfail_chrome
760-
@pytest.mark.xfail_firefox
761-
@pytest.mark.xfail_edge
762759
def test_add_event_handler_history_updated(driver, pages):
763760
"""Test adding event handler for history_updated event."""
764761
events_received = []
@@ -769,16 +766,17 @@ def on_history_updated(info):
769766
callback_id = driver.browsing_context.add_event_handler("history_updated", on_history_updated)
770767
assert callback_id is not None
771768

772-
# Navigate to a page and use history API to trigger the event
773769
context_id = driver.current_window_handle
774770
url = pages.url("simpleTest.html")
775771
driver.browsing_context.navigate(context=context_id, url=url, wait=ReadinessState.COMPLETE)
776772

777773
# Use history.pushState to trigger history updated event
778-
driver.execute_script("history.pushState({}, '', '/new-path');")
774+
driver.script.execute("() => { history.pushState({}, '', '/new-path'); }")
775+
WebDriverWait(driver, 5).until(lambda d: len(events_received) > 0)
779776

780-
assert len(events_received) == 1
781-
assert any("/new-path" in event.url for event in events_received)
777+
assert len(events_received) >= 1
778+
assert "/new-path" in events_received[0].url
779+
assert events_received[0].context == context_id
782780

783781
driver.browsing_context.remove_event_handler("history_updated", callback_id)
784782

0 commit comments

Comments
 (0)