Skip to content

[build] minimize number of ruby targets run with bidi #16477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 21, 2025
+43 −34
Merged

[build] minimize number of ruby targets run with bidi #16477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfc0bea
[rb] minimize number of targets run with bidi
titusfortner Oct 21, 2025
68dd81c
fix file references
titusfortner Oct 21, 2025
12f54cc
fix the bazel logic that checks for tags in the loop
titusfortner Oct 21, 2025
643dfe2
fix failed to load issue
titusfortner Oct 21, 2025
4d728bc
fix bazel formatting
titusfortner Oct 21, 2025
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
6 changes: 0 additions & 6 deletions .skipped-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,12 @@
-//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
-//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote
-//rb/spec/integration/selenium/webdriver/edge:service-edge
-//rb/spec/integration/selenium/webdriver/edge:service-edge-bidi
-//rb/spec/integration/selenium/webdriver/edge:service-edge-remote
-//rb/spec/integration/selenium/webdriver/firefox:driver-firefox-beta-bidi
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-bidi
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-remote
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-bidi
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-remote
-//rb/spec/integration/selenium/webdriver/remote:driver-chrome-remote
-//rb/spec/integration/selenium/webdriver/remote:driver-edge-remote
Expand All @@ -49,6 +44,5 @@
-//rb/spec/integration/selenium/webdriver/remote:element-firefox-remote
-//rb/spec/integration/selenium/webdriver:action_builder-firefox-beta-remote
-//rb/spec/integration/selenium/webdriver:element-chrome
-//rb/spec/integration/selenium/webdriver:element-chrome-bidi
-//rb/spec/integration/selenium/webdriver:element-chrome-remote
-//rb:lint
29 changes: 20 additions & 9 deletions rb/spec/integration/selenium/webdriver/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,30 @@ rb_library(
"driver_spec.rb",
"devtools_spec.rb",
"element_spec.rb",
"navigation_spec.rb",
"network_spec.rb",
],
)
]

rb_integration_test(
name = "bidi",
srcs = ["bidi_spec.rb"],
tags = ["exclusive-if-local"],
deps = [
"//rb/lib/selenium/devtools",
"//rb/lib/selenium/webdriver:bidi",
],
)
_BIDI_FILES = [
"bidi_spec.rb",
"navigation_spec.rb",
"network_spec.rb",
]

[
rb_integration_test(
name = f[:-8],
srcs = [f],
tags = ["bidi"],
deps = [
"//rb/lib/selenium/devtools",
"//rb/lib/selenium/webdriver:bidi",
],
)
for f in _BIDI_FILES
]

rb_integration_test(
name = "devtools",
Expand Down
5 changes: 4 additions & 1 deletion rb/spec/integration/selenium/webdriver/bidi/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ load("//rb/spec:tests.bzl", "rb_integration_test")
rb_integration_test(
name = file[:-8],
srcs = [file],
tags = ["exclusive-if-local"],
tags = [
"bidi",
"exclusive-if-local",
],
deps = [
"//rb/lib/selenium/devtools",
"//rb/lib/selenium/webdriver:bidi",
Expand Down
37 changes: 19 additions & 18 deletions rb/spec/tests.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,24 +214,25 @@ def rb_integration_test(name, srcs, deps = [], data = [], browsers = BROWSERS.ke
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
)

# Generate a test target for bidi browser execution.
rb_test(
name = "{}-{}-bidi".format(name, browser),
size = "large",
srcs = srcs,
args = ["rb/spec/"],
data = BROWSERS[browser]["data"] + data + ["//common/src/web"],
env = BROWSERS[browser]["env"] | {"WEBDRIVER_BIDI": "true"},
main = "@bundle//bin:rspec",
tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + ["{}-bidi".format(browser)],
deps = depset(
["//rb/spec/integration/selenium/webdriver:spec_helper", "//rb/lib/selenium/webdriver:bidi"] +
BROWSERS[browser]["deps"] +
deps,
),
visibility = ["//rb:__subpackages__"],
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
)
# Generate a test target for bidi browser execution if there is a matching tag
if "bidi" in tags:
rb_test(
name = "{}-{}-bidi".format(name, browser),
size = "large",
srcs = srcs,
args = ["rb/spec/"],
data = BROWSERS[browser]["data"] + data + ["//common/src/web"],
env = BROWSERS[browser]["env"] | {"WEBDRIVER_BIDI": "true"},
main = "@bundle//bin:rspec",
tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + ["{}-bidi".format(browser)],
deps = depset(
["//rb/spec/integration/selenium/webdriver:spec_helper", "//rb/lib/selenium/webdriver:bidi"] +
BROWSERS[browser]["deps"] +
deps,
),
visibility = ["//rb:__subpackages__"],
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
)

def rb_unit_test(name, srcs, deps, data = []):
rb_test(
Expand Down
Loading