Skip to content

Commit bfc0bea

Browse files
committed
[rb] minimize number of targets run with bidi
1 parent 13b63f6 commit bfc0bea

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
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/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ rb_library(
1717
deps = [
1818
"//rb/spec:rspec_matchers",
1919
"//rb/spec/integration/selenium/webdriver:action_builder",
20-
"//rb/spec/integration/selenium/webdriver:bidi",
2120
"//rb/spec/integration/selenium/webdriver:devtools",
2221
"//rb/spec/integration/selenium/webdriver:driver",
2322
"//rb/spec/integration/selenium/webdriver:element",

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,25 @@ rb_library(
4242
"driver_spec.rb",
4343
"devtools_spec.rb",
4444
"element_spec.rb",
45+
"network_spec.rb",
4546
],
4647
)
4748
]
4849

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-
)
50+
_BIDI_FILES = [
51+
"bidi_spec.rb",
52+
"navigation_spec.rb",
53+
"network_spec.rb",
54+
]
55+
56+
[
57+
rb_integration_test(
58+
name = f[:-7],
59+
srcs = [f],
60+
tags = ["bidi"],
61+
)
62+
for f in _BIDI_FILES
63+
]
5864

5965
rb_integration_test(
6066
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+
"exclusive-if-local",
9+
"bidi"
10+
],
811
deps = [
912
"//rb/lib/selenium/devtools",
1013
"//rb/lib/selenium/webdriver:bidi",

rb/spec/tests.bzl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@ def rb_integration_test(name, srcs, deps = [], data = [], browsers = BROWSERS.ke
215215
)
216216

217217
# Generate a test target for bidi browser execution.
218+
if "bidi" not in tags:
219+
return # don't create -bidi targets for non-BiDi tests
220+
218221
rb_test(
219222
name = "{}-{}-bidi".format(name, browser),
220223
size = "large",

0 commit comments

Comments
 (0)