Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion py/private/bidi_enhancements_manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,8 @@ def to_bidi_dict(self) -> dict:
return self._request_handlers.add_handler(url_patterns, event)
if callable(callback) and event not in LEGACY_REQUEST_HANDLER_EVENTS:
if not isinstance(event, str) or looks_like_url_glob(event):
return self._request_handlers.add_handler(event, callback)
patterns = event if event is not None else url_patterns
return self._request_handlers.add_handler(patterns, callback)
canonical_event = self._canonical_request_handler_event(event)
phase_map = {
"before_request": "beforeRequestSent",
Expand Down
13 changes: 13 additions & 0 deletions py/test/unit/selenium/webdriver/common/bidi_network_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,19 @@ def test_translatable_patterns_are_sent_to_browser():
assert params["urlPatterns"] == [{"type": "pattern", "protocol": "https", "hostname": "api.tracking.com"}]


def test_url_patterns_keyword_scopes_callback_handler():
conn = FakeConnection()
network = Network(conn)

network.add_request_handler(
callback=lambda request: None,
url_patterns=["https://api.tracking.com/**"],
)

params = conn.commands_named("network.addIntercept")[0]["params"]
assert params["urlPatterns"] == [{"type": "pattern", "protocol": "https", "hostname": "api.tracking.com"}]


def test_blocked_event_owned_by_another_intercept_is_left_alone():
conn = FakeConnection()
network = Network(conn)
Expand Down
Loading