Skip to content

Commit b3b23f5

Browse files
authored
[build] minimize number of ruby targets run with bidi (#16477)
* [rb] minimize number of targets run with bidi * fix file references * fix the bazel logic that checks for tags in the loop * fix failed to load issue * fix bazel formatting
1 parent 0606401 commit b3b23f5

File tree

4 files changed

+43
-34
lines changed

4 files changed

+43
-34
lines changed

.skipped-tests

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,12 @@
2727
-//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
2828
-//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
2929
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome
30-
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
3130
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote
3231
-//rb/spec/integration/selenium/webdriver/edge:service-edge
33-
-//rb/spec/integration/selenium/webdriver/edge:service-edge-bidi
3432
-//rb/spec/integration/selenium/webdriver/edge:service-edge-remote
35-
-//rb/spec/integration/selenium/webdriver/firefox:driver-firefox-beta-bidi
3633
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox
3734
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta
38-
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-bidi
3935
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-remote
40-
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-bidi
4136
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-remote
4237
-//rb/spec/integration/selenium/webdriver/remote:driver-chrome-remote
4338
-//rb/spec/integration/selenium/webdriver/remote:driver-edge-remote
@@ -49,6 +44,5 @@
4944
-//rb/spec/integration/selenium/webdriver/remote:element-firefox-remote
5045
-//rb/spec/integration/selenium/webdriver:action_builder-firefox-beta-remote
5146
-//rb/spec/integration/selenium/webdriver:element-chrome
52-
-//rb/spec/integration/selenium/webdriver:element-chrome-bidi
5347
-//rb/spec/integration/selenium/webdriver:element-chrome-remote
5448
-//rb:lint

rb/spec/integration/selenium/webdriver/BUILD.bazel

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,30 @@ rb_library(
4242
"driver_spec.rb",
4343
"devtools_spec.rb",
4444
"element_spec.rb",
45+
"navigation_spec.rb",
46+
"network_spec.rb",
4547
],
4648
)
4749
]
4850

49-
rb_integration_test(
50-
name = "bidi",
51-
srcs = ["bidi_spec.rb"],
52-
tags = ["exclusive-if-local"],
53-
deps = [
54-
"//rb/lib/selenium/devtools",
55-
"//rb/lib/selenium/webdriver:bidi",
56-
],
57-
)
51+
_BIDI_FILES = [
52+
"bidi_spec.rb",
53+
"navigation_spec.rb",
54+
"network_spec.rb",
55+
]
56+
57+
[
58+
rb_integration_test(
59+
name = f[:-8],
60+
srcs = [f],
61+
tags = ["bidi"],
62+
deps = [
63+
"//rb/lib/selenium/devtools",
64+
"//rb/lib/selenium/webdriver:bidi",
65+
],
66+
)
67+
for f in _BIDI_FILES
68+
]
5869

5970
rb_integration_test(
6071
name = "devtools",

rb/spec/integration/selenium/webdriver/bidi/BUILD.bazel

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ load("//rb/spec:tests.bzl", "rb_integration_test")
44
rb_integration_test(
55
name = file[:-8],
66
srcs = [file],
7-
tags = ["exclusive-if-local"],
7+
tags = [
8+
"bidi",
9+
"exclusive-if-local",
10+
],
811
deps = [
912
"//rb/lib/selenium/devtools",
1013
"//rb/lib/selenium/webdriver:bidi",

rb/spec/tests.bzl

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -214,24 +214,25 @@ def rb_integration_test(name, srcs, deps = [], data = [], browsers = BROWSERS.ke
214214
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
215215
)
216216

217-
# Generate a test target for bidi browser execution.
218-
rb_test(
219-
name = "{}-{}-bidi".format(name, browser),
220-
size = "large",
221-
srcs = srcs,
222-
args = ["rb/spec/"],
223-
data = BROWSERS[browser]["data"] + data + ["//common/src/web"],
224-
env = BROWSERS[browser]["env"] | {"WEBDRIVER_BIDI": "true"},
225-
main = "@bundle//bin:rspec",
226-
tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + ["{}-bidi".format(browser)],
227-
deps = depset(
228-
["//rb/spec/integration/selenium/webdriver:spec_helper", "//rb/lib/selenium/webdriver:bidi"] +
229-
BROWSERS[browser]["deps"] +
230-
deps,
231-
),
232-
visibility = ["//rb:__subpackages__"],
233-
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
234-
)
217+
# Generate a test target for bidi browser execution if there is a matching tag
218+
if "bidi" in tags:
219+
rb_test(
220+
name = "{}-{}-bidi".format(name, browser),
221+
size = "large",
222+
srcs = srcs,
223+
args = ["rb/spec/"],
224+
data = BROWSERS[browser]["data"] + data + ["//common/src/web"],
225+
env = BROWSERS[browser]["env"] | {"WEBDRIVER_BIDI": "true"},
226+
main = "@bundle//bin:rspec",
227+
tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + ["{}-bidi".format(browser)],
228+
deps = depset(
229+
["//rb/spec/integration/selenium/webdriver:spec_helper", "//rb/lib/selenium/webdriver:bidi"] +
230+
BROWSERS[browser]["deps"] +
231+
deps,
232+
),
233+
visibility = ["//rb:__subpackages__"],
234+
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
235+
)
235236

236237
def rb_unit_test(name, srcs, deps, data = []):
237238
rb_test(

0 commit comments

Comments
 (0)