Skip to content

Commit 12f54cc

Browse files
committed
fix the bazel logic that checks for tags in the loop
1 parent 68dd81c commit 12f54cc

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

rb/spec/tests.bzl

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -214,27 +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-
if "bidi" not in tags:
219-
return # don't create -bidi targets for non-BiDi tests
220-
221-
rb_test(
222-
name = "{}-{}-bidi".format(name, browser),
223-
size = "large",
224-
srcs = srcs,
225-
args = ["rb/spec/"],
226-
data = BROWSERS[browser]["data"] + data + ["//common/src/web"],
227-
env = BROWSERS[browser]["env"] | {"WEBDRIVER_BIDI": "true"},
228-
main = "@bundle//bin:rspec",
229-
tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + ["{}-bidi".format(browser)],
230-
deps = depset(
231-
["//rb/spec/integration/selenium/webdriver:spec_helper", "//rb/lib/selenium/webdriver:bidi"] +
232-
BROWSERS[browser]["deps"] +
233-
deps,
234-
),
235-
visibility = ["//rb:__subpackages__"],
236-
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
237-
)
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+
)
238236

239237
def rb_unit_test(name, srcs, deps, data = []):
240238
rb_test(

0 commit comments

Comments
 (0)