From 124899559c75735d444af18e882dfd73bde91b1b Mon Sep 17 00:00:00 2001 From: Titus Fortner Date: Tue, 2 Jun 2026 16:26:02 -0500 Subject: [PATCH] [rb] Run unit tests as a single Bazel target instead of per-file --- README.md | 9 +-- rb/spec/BUILD.bazel | 63 +------------------ rb/spec/tests.bzl | 14 ----- rb/spec/unit/BUILD.bazel | 48 ++++++++++++++ rb/spec/unit/selenium/BUILD.bazel | 26 -------- rb/spec/unit/selenium/devtools/BUILD.bazel | 13 ---- rb/spec/unit/selenium/webdriver/BUILD.bazel | 47 -------------- .../unit/selenium/webdriver/bidi/BUILD.bazel | 10 --- .../selenium/webdriver/chrome/BUILD.bazel | 14 ----- .../selenium/webdriver/common/BUILD.bazel | 58 ----------------- .../webdriver/common/fedcm/BUILD.bazel | 16 ----- .../webdriver/common/interactions/BUILD.bazel | 13 ---- .../selenium/webdriver/devtools/BUILD.bazel | 10 --- .../unit/selenium/webdriver/edge/BUILD.bazel | 14 ----- .../selenium/webdriver/firefox/BUILD.bazel | 19 ------ .../unit/selenium/webdriver/ie/BUILD.bazel | 14 ----- .../selenium/webdriver/remote/BUILD.bazel | 14 ----- .../webdriver/remote/features_spec.rb | 4 +- .../webdriver/remote/http/BUILD.bazel | 10 --- .../selenium/webdriver/safari/BUILD.bazel | 14 ----- .../selenium/webdriver/support/BUILD.bazel | 28 --------- third_party/firebug/BUILD.bazel | 2 +- 22 files changed, 58 insertions(+), 402 deletions(-) create mode 100644 rb/spec/unit/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/devtools/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/bidi/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/chrome/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/common/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/common/fedcm/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/common/interactions/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/devtools/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/edge/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/firefox/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/ie/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/remote/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/remote/http/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/safari/BUILD.bazel delete mode 100644 rb/spec/unit/selenium/webdriver/support/BUILD.bazel diff --git a/README.md b/README.md index 13c1277163902..426f99c889186 100644 --- a/README.md +++ b/README.md @@ -448,13 +448,14 @@ Test targets: | `bazel test //rb/spec/integration/... --test_tag_filters firefox-remote` | Run integration tests for remote Firefox only | | `bazel test //rb/spec/integration/... --test_tag_filters bidi` | Run bidi-mode tests across every browser that supports BiDi | -Ruby test targets have the same name as the spec file with `_spec.rb` removed, so you can run them individually. -Integration test targets also have a browser-variant suffix to control which browser to pick and whether to use Grid or BiDi -(e.g. `-chrome`, `-chrome-remote`, `-chrome-beta-bidi`). +All unit specs run as a single target, `//rb/spec/unit:unit`. + +Integration test targets have the same name as the spec file with `_spec.rb` removed, plus a +browser-variant suffix to control which browser to pick and whether to use Grid or BiDi +(e.g. `-chrome`, `-chrome-remote`, `-chrome-beta-bidi`), so you can run them individually. | Test file | Test target | | ------------------------------------------------------- | ---------------------------------------------------------------- | -| `rb/spec/unit/selenium/webdriver/proxy_spec.rb` | `//rb/spec/unit/selenium/webdriver:proxy` | | `rb/spec/integration/selenium/webdriver/driver_spec.rb` | `//rb/spec/integration/selenium/webdriver:driver-chrome` | | `rb/spec/integration/selenium/webdriver/driver_spec.rb` | `//rb/spec/integration/selenium/webdriver:driver-chrome-remote` | | `rb/spec/integration/selenium/webdriver/driver_spec.rb` | `//rb/spec/integration/selenium/webdriver:driver-firefox` | diff --git a/rb/spec/BUILD.bazel b/rb/spec/BUILD.bazel index 7d117d86c1180..767e410f54425 100644 --- a/rb/spec/BUILD.bazel +++ b/rb/spec/BUILD.bazel @@ -48,67 +48,8 @@ rb_library( "//rb/spec/integration/selenium/webdriver/remote:driver", "//rb/spec/integration/selenium/webdriver/remote:element", "//rb/spec/integration/selenium/webdriver/safari:driver", - "//rb/spec/unit/selenium:devtools", - "//rb/spec/unit/selenium:server", - "//rb/spec/unit/selenium/devtools:cdp_client_generator", - "//rb/spec/unit/selenium/webdriver:file_reaper", - "//rb/spec/unit/selenium/webdriver:guard", - "//rb/spec/unit/selenium/webdriver:proxy", - "//rb/spec/unit/selenium/webdriver:search_context", - "//rb/spec/unit/selenium/webdriver:socket_poller", - "//rb/spec/unit/selenium/webdriver:spec_helper", - "//rb/spec/unit/selenium/webdriver:wait", - "//rb/spec/unit/selenium/webdriver/chrome:driver", - "//rb/spec/unit/selenium/webdriver/chrome:options", - "//rb/spec/unit/selenium/webdriver/chrome:service", - "//rb/spec/unit/selenium/webdriver/common:action_builder", - "//rb/spec/unit/selenium/webdriver/common:credentials", - "//rb/spec/unit/selenium/webdriver/common:driver_finder", - "//rb/spec/unit/selenium/webdriver/common:logger", - "//rb/spec/unit/selenium/webdriver/common:selenium_manager", - "//rb/spec/unit/selenium/webdriver/common:service", - "//rb/spec/unit/selenium/webdriver/common:virtual_authenticator_options", - "//rb/spec/unit/selenium/webdriver/common/interactions", - "//rb/spec/unit/selenium/webdriver/common/interactions:input_device", - "//rb/spec/unit/selenium/webdriver/common/interactions:interaction", - "//rb/spec/unit/selenium/webdriver/common/interactions:key_actions", - "//rb/spec/unit/selenium/webdriver/common/interactions:key_input", - "//rb/spec/unit/selenium/webdriver/common/interactions:none_input", - "//rb/spec/unit/selenium/webdriver/common/interactions:pause", - "//rb/spec/unit/selenium/webdriver/common/interactions:pointer_actions", - "//rb/spec/unit/selenium/webdriver/common/interactions:pointer_cancel", - "//rb/spec/unit/selenium/webdriver/common/interactions:pointer_event_prop", - "//rb/spec/unit/selenium/webdriver/common/interactions:pointer_input", - "//rb/spec/unit/selenium/webdriver/common/interactions:pointer_move", - "//rb/spec/unit/selenium/webdriver/common/interactions:pointer_press", - "//rb/spec/unit/selenium/webdriver/common/interactions:scroll", - "//rb/spec/unit/selenium/webdriver/common/interactions:typing_interactions", - "//rb/spec/unit/selenium/webdriver/common/interactions:wheel_actions", - "//rb/spec/unit/selenium/webdriver/common/interactions:wheel_input", - "//rb/spec/unit/selenium/webdriver/devtools:request", - "//rb/spec/unit/selenium/webdriver/devtools:response", - "//rb/spec/unit/selenium/webdriver/edge:driver", - "//rb/spec/unit/selenium/webdriver/edge:options", - "//rb/spec/unit/selenium/webdriver/edge:service", - "//rb/spec/unit/selenium/webdriver/firefox:driver", - "//rb/spec/unit/selenium/webdriver/firefox:extension", - "//rb/spec/unit/selenium/webdriver/firefox:options", - "//rb/spec/unit/selenium/webdriver/firefox:profile", - "//rb/spec/unit/selenium/webdriver/firefox:service", - "//rb/spec/unit/selenium/webdriver/ie:driver", - "//rb/spec/unit/selenium/webdriver/ie:options", - "//rb/spec/unit/selenium/webdriver/ie:service", - "//rb/spec/unit/selenium/webdriver/remote:bridge", - "//rb/spec/unit/selenium/webdriver/remote:capabilities", - "//rb/spec/unit/selenium/webdriver/remote:driver", - "//rb/spec/unit/selenium/webdriver/remote/http:common", - "//rb/spec/unit/selenium/webdriver/remote/http:default", - "//rb/spec/unit/selenium/webdriver/safari:driver", - "//rb/spec/unit/selenium/webdriver/safari:options", - "//rb/spec/unit/selenium/webdriver/safari:service", - "//rb/spec/unit/selenium/webdriver/support:color", - "//rb/spec/unit/selenium/webdriver/support:event_firing", - "//rb/spec/unit/selenium/webdriver/support:select", + "//rb/spec/unit", + "//rb/spec/unit:spec_helper", ], ) diff --git a/rb/spec/tests.bzl b/rb/spec/tests.bzl index 9ba2f05916c70..566130e77dee8 100644 --- a/rb/spec/tests.bzl +++ b/rb/spec/tests.bzl @@ -266,17 +266,3 @@ def rb_integration_test( visibility = ["//rb:__subpackages__"], target_compatible_with = BROWSERS[browser]["target_compatible_with"], ) - -def rb_unit_test(name, srcs, deps, data = [], flaky = False): - rb_test( - name = name, - size = "small", - srcs = srcs, - args = ["rb/spec/"], - flaky = flaky, - main = "@bundle//bin:rspec", - data = data, - tags = ["unit"], - deps = ["//rb/spec/unit/selenium/webdriver:spec_helper"] + deps, - visibility = ["//rb:__subpackages__"], - ) diff --git a/rb/spec/unit/BUILD.bazel b/rb/spec/unit/BUILD.bazel new file mode 100644 index 0000000000000..7a5d0be0fa28b --- /dev/null +++ b/rb/spec/unit/BUILD.bazel @@ -0,0 +1,48 @@ +load("@rules_ruby//ruby:defs.bzl", "rb_library", "rb_test") + +rb_library( + name = "spec_helper", + testonly = True, + srcs = ["selenium/webdriver/spec_helper.rb"], + visibility = ["//rb/spec:__subpackages__"], + deps = [ + "//rb/lib:selenium-webdriver", + "//rb/lib/selenium:webdriver", + "//rb/lib/selenium/webdriver:atoms", + "//rb/spec:rspec_matchers", + "@bundle", + ], +) + +rb_test( + name = "unit", + size = "small", + srcs = glob(["**/*_spec.rb"]), + args = ["rb/spec/unit/"], + data = [ + "//third_party/firebug:favourite_colour-1.1-an+fx.xpi", + "//third_party/firebug:firebug-1.5.0-fx.xpi", + "//third_party/firebug:mooltipass-1.1.87.xpi", + ], + main = "@bundle//bin:rspec", + tags = ["unit"], + visibility = ["//rb:__subpackages__"], + deps = [ + ":spec_helper", + "//rb/lib:selenium-webdriver", + "//rb/lib/selenium:devtools", + "//rb/lib/selenium:server", + "//rb/lib/selenium:webdriver", + "//rb/lib/selenium/devtools:cdp-generate", + "//rb/lib/selenium/webdriver:atoms", + "//rb/lib/selenium/webdriver:bidi", + "//rb/lib/selenium/webdriver:chrome", + "//rb/lib/selenium/webdriver:common", + "//rb/lib/selenium/webdriver:devtools", + "//rb/lib/selenium/webdriver:edge", + "//rb/lib/selenium/webdriver:firefox", + "//rb/lib/selenium/webdriver:ie", + "//rb/lib/selenium/webdriver:remote", + "//rb/lib/selenium/webdriver:safari", + ], +) diff --git a/rb/spec/unit/selenium/BUILD.bazel b/rb/spec/unit/selenium/BUILD.bazel deleted file mode 100644 index c19bda620f7ef..0000000000000 --- a/rb/spec/unit/selenium/BUILD.bazel +++ /dev/null @@ -1,26 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -rb_unit_test( - name = "devtools", - srcs = ["devtools_spec.rb"], - deps = [ - "//rb/lib:selenium-webdriver", - "//rb/lib/selenium:devtools", - "//rb/lib/selenium:webdriver", - "//rb/lib/selenium/webdriver:atoms", - "//rb/lib/selenium/webdriver:common", - ], -) - -rb_unit_test( - name = "server", - srcs = ["server_spec.rb"], - deps = [ - "//rb/lib:selenium-webdriver", - "//rb/lib/selenium:devtools", - "//rb/lib/selenium:server", - "//rb/lib/selenium:webdriver", - "//rb/lib/selenium/webdriver:atoms", - "//rb/lib/selenium/webdriver:common", - ], -) diff --git a/rb/spec/unit/selenium/devtools/BUILD.bazel b/rb/spec/unit/selenium/devtools/BUILD.bazel deleted file mode 100644 index 8ef72c02667d5..0000000000000 --- a/rb/spec/unit/selenium/devtools/BUILD.bazel +++ /dev/null @@ -1,13 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -rb_unit_test( - name = "cdp_client_generator", - srcs = ["cdp_client_generator_spec.rb"], - deps = [ - "//rb/lib:selenium-webdriver", - "//rb/lib/selenium:webdriver", - "//rb/lib/selenium/devtools:cdp-generate", - "//rb/lib/selenium/webdriver:atoms", - "//rb/lib/selenium/webdriver:common", - ], -) diff --git a/rb/spec/unit/selenium/webdriver/BUILD.bazel b/rb/spec/unit/selenium/webdriver/BUILD.bazel deleted file mode 100644 index 121a71ec8db4d..0000000000000 --- a/rb/spec/unit/selenium/webdriver/BUILD.bazel +++ /dev/null @@ -1,47 +0,0 @@ -load("@rules_ruby//ruby:defs.bzl", "rb_library") -load("//rb/spec:tests.bzl", "rb_unit_test") - -rb_library( - name = "spec_helper", - testonly = True, - srcs = ["spec_helper.rb"], - visibility = ["//rb/spec:__subpackages__"], - deps = [ - "//rb/lib:selenium-webdriver", - "//rb/lib/selenium:webdriver", - "//rb/lib/selenium/webdriver:atoms", - "//rb/spec:rspec_matchers", - "@bundle", - ], -) - -rb_unit_test( - name = "search_context", - srcs = ["search_context_spec.rb"], - deps = [ - "//rb/lib/selenium/webdriver:common", - "//rb/lib/selenium/webdriver:remote", - ], -) - -rb_unit_test( - name = "zipper", - srcs = ["zipper_spec.rb"], - flaky = True, - deps = ["//rb/lib/selenium/webdriver:common"], -) - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = ["//rb/lib/selenium/webdriver:common"], - ) - for file in glob( - ["*_spec.rb"], - exclude = [ - "search_context_spec.rb", - "zipper_spec.rb", - ], - ) -] diff --git a/rb/spec/unit/selenium/webdriver/bidi/BUILD.bazel b/rb/spec/unit/selenium/webdriver/bidi/BUILD.bazel deleted file mode 100644 index 7b01c0fc5d000..0000000000000 --- a/rb/spec/unit/selenium/webdriver/bidi/BUILD.bazel +++ /dev/null @@ -1,10 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = ["//rb/lib/selenium/webdriver:bidi"], - ) - for file in glob(["*_spec.rb"]) -] diff --git a/rb/spec/unit/selenium/webdriver/chrome/BUILD.bazel b/rb/spec/unit/selenium/webdriver/chrome/BUILD.bazel deleted file mode 100644 index 65744c4c82d54..0000000000000 --- a/rb/spec/unit/selenium/webdriver/chrome/BUILD.bazel +++ /dev/null @@ -1,14 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = [ - "//rb/lib/selenium/webdriver:chrome", - "//rb/lib/selenium/webdriver:firefox", - "//rb/lib/selenium/webdriver:remote", - ], - ) - for file in glob(["*_spec.rb"]) -] diff --git a/rb/spec/unit/selenium/webdriver/common/BUILD.bazel b/rb/spec/unit/selenium/webdriver/common/BUILD.bazel deleted file mode 100644 index 2a48b49fb8d55..0000000000000 --- a/rb/spec/unit/selenium/webdriver/common/BUILD.bazel +++ /dev/null @@ -1,58 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = [ - "//rb/lib/selenium/webdriver:common", - "//rb/lib/selenium/webdriver:remote", - ], - ) - for file in glob( - ["*_spec.rb"], - exclude = [ - "driver_finder_spec.rb", - "selenium_manager_spec.rb", - "service_spec.rb", - ], - ) -] - -rb_unit_test( - name = "driver_finder", - srcs = ["driver_finder_spec.rb"], - deps = [ - "//rb/lib/selenium/webdriver:chrome", - "//rb/lib/selenium/webdriver:common", - "//rb/lib/selenium/webdriver:edge", - "//rb/lib/selenium/webdriver:firefox", - "//rb/lib/selenium/webdriver:ie", - "//rb/lib/selenium/webdriver:remote", - "//rb/lib/selenium/webdriver:safari", - ], -) - -rb_unit_test( - name = "selenium_manager", - srcs = ["selenium_manager_spec.rb"], - deps = [ - "//rb/lib/selenium/webdriver:chrome", - "//rb/lib/selenium/webdriver:common", - "//rb/lib/selenium/webdriver:remote", - ], -) - -rb_unit_test( - name = "service", - srcs = ["service_spec.rb"], - deps = [ - "//rb/lib/selenium/webdriver:chrome", - "//rb/lib/selenium/webdriver:common", - "//rb/lib/selenium/webdriver:edge", - "//rb/lib/selenium/webdriver:firefox", - "//rb/lib/selenium/webdriver:ie", - "//rb/lib/selenium/webdriver:remote", - "//rb/lib/selenium/webdriver:safari", - ], -) diff --git a/rb/spec/unit/selenium/webdriver/common/fedcm/BUILD.bazel b/rb/spec/unit/selenium/webdriver/common/fedcm/BUILD.bazel deleted file mode 100644 index ece57870bd638..0000000000000 --- a/rb/spec/unit/selenium/webdriver/common/fedcm/BUILD.bazel +++ /dev/null @@ -1,16 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -rb_unit_test( - name = "account", - srcs = ["account_spec.rb"], - deps = ["//rb/lib/selenium/webdriver:common"], -) - -rb_unit_test( - name = "dialog", - srcs = ["dialog_spec.rb"], - deps = [ - "//rb/lib/selenium/webdriver:common", - "//rb/lib/selenium/webdriver:remote", - ], -) diff --git a/rb/spec/unit/selenium/webdriver/common/interactions/BUILD.bazel b/rb/spec/unit/selenium/webdriver/common/interactions/BUILD.bazel deleted file mode 100644 index 812e5236fa39d..0000000000000 --- a/rb/spec/unit/selenium/webdriver/common/interactions/BUILD.bazel +++ /dev/null @@ -1,13 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = [ - "//rb/lib/selenium/webdriver:common", - "//rb/lib/selenium/webdriver:remote", - ], - ) - for file in glob(["*_spec.rb"]) -] diff --git a/rb/spec/unit/selenium/webdriver/devtools/BUILD.bazel b/rb/spec/unit/selenium/webdriver/devtools/BUILD.bazel deleted file mode 100644 index ddc1bb62cd6b1..0000000000000 --- a/rb/spec/unit/selenium/webdriver/devtools/BUILD.bazel +++ /dev/null @@ -1,10 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = ["//rb/lib/selenium/webdriver:devtools"], - ) - for file in glob(["*_spec.rb"]) -] diff --git a/rb/spec/unit/selenium/webdriver/edge/BUILD.bazel b/rb/spec/unit/selenium/webdriver/edge/BUILD.bazel deleted file mode 100644 index 0a0ecb3939591..0000000000000 --- a/rb/spec/unit/selenium/webdriver/edge/BUILD.bazel +++ /dev/null @@ -1,14 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = [ - "//rb/lib/selenium/webdriver:chrome", - "//rb/lib/selenium/webdriver:edge", - "//rb/lib/selenium/webdriver:remote", - ], - ) - for file in glob(["*_spec.rb"]) -] diff --git a/rb/spec/unit/selenium/webdriver/firefox/BUILD.bazel b/rb/spec/unit/selenium/webdriver/firefox/BUILD.bazel deleted file mode 100644 index bf11bf59032dc..0000000000000 --- a/rb/spec/unit/selenium/webdriver/firefox/BUILD.bazel +++ /dev/null @@ -1,19 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - data = [ - "//third_party/firebug:favourite_colour-1.1-an+fx.xpi", - "//third_party/firebug:firebug-1.5.0-fx.xpi", - "//third_party/firebug:mooltipass-1.1.87.xpi", - ], - deps = [ - "//rb/lib/selenium/webdriver:chrome", - "//rb/lib/selenium/webdriver:firefox", - "//rb/lib/selenium/webdriver:remote", - ], - ) - for file in glob(["*_spec.rb"]) -] diff --git a/rb/spec/unit/selenium/webdriver/ie/BUILD.bazel b/rb/spec/unit/selenium/webdriver/ie/BUILD.bazel deleted file mode 100644 index 5aa5e783acf53..0000000000000 --- a/rb/spec/unit/selenium/webdriver/ie/BUILD.bazel +++ /dev/null @@ -1,14 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = [ - "//rb/lib/selenium/webdriver:chrome", - "//rb/lib/selenium/webdriver:ie", - "//rb/lib/selenium/webdriver:remote", - ], - ) - for file in glob(["*_spec.rb"]) -] diff --git a/rb/spec/unit/selenium/webdriver/remote/BUILD.bazel b/rb/spec/unit/selenium/webdriver/remote/BUILD.bazel deleted file mode 100644 index 65744c4c82d54..0000000000000 --- a/rb/spec/unit/selenium/webdriver/remote/BUILD.bazel +++ /dev/null @@ -1,14 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = [ - "//rb/lib/selenium/webdriver:chrome", - "//rb/lib/selenium/webdriver:firefox", - "//rb/lib/selenium/webdriver:remote", - ], - ) - for file in glob(["*_spec.rb"]) -] diff --git a/rb/spec/unit/selenium/webdriver/remote/features_spec.rb b/rb/spec/unit/selenium/webdriver/remote/features_spec.rb index e924f80c98a91..78ff901fa51cf 100644 --- a/rb/spec/unit/selenium/webdriver/remote/features_spec.rb +++ b/rb/spec/unit/selenium/webdriver/remote/features_spec.rb @@ -32,7 +32,7 @@ module Remote .and_return('status' => 200, 'value' => {'sessionId' => 'foo', 'capabilities' => {}}) bridge.create_session({}) - bridge.extend(Features) + bridge.extend(described_class) bridge.add_commands(Features::REMOTE_COMMANDS) end @@ -73,4 +73,4 @@ module Remote end end end -end \ No newline at end of file +end diff --git a/rb/spec/unit/selenium/webdriver/remote/http/BUILD.bazel b/rb/spec/unit/selenium/webdriver/remote/http/BUILD.bazel deleted file mode 100644 index 27a75218474a1..0000000000000 --- a/rb/spec/unit/selenium/webdriver/remote/http/BUILD.bazel +++ /dev/null @@ -1,10 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = ["//rb/lib/selenium/webdriver:remote"], - ) - for file in glob(["*_spec.rb"]) -] diff --git a/rb/spec/unit/selenium/webdriver/safari/BUILD.bazel b/rb/spec/unit/selenium/webdriver/safari/BUILD.bazel deleted file mode 100644 index d54404ec4b08c..0000000000000 --- a/rb/spec/unit/selenium/webdriver/safari/BUILD.bazel +++ /dev/null @@ -1,14 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = [ - "//rb/lib/selenium/webdriver:chrome", - "//rb/lib/selenium/webdriver:remote", - "//rb/lib/selenium/webdriver:safari", - ], - ) - for file in glob(["*_spec.rb"]) -] diff --git a/rb/spec/unit/selenium/webdriver/support/BUILD.bazel b/rb/spec/unit/selenium/webdriver/support/BUILD.bazel deleted file mode 100644 index 770888eaca946..0000000000000 --- a/rb/spec/unit/selenium/webdriver/support/BUILD.bazel +++ /dev/null @@ -1,28 +0,0 @@ -load("//rb/spec:tests.bzl", "rb_unit_test") - -package(default_visibility = ["//rb:__subpackages__"]) - -rb_unit_test( - name = "select", - srcs = ["select_spec.rb"], - flaky = True, - deps = [ - "//rb/lib/selenium/webdriver:common", - "//rb/lib/selenium/webdriver:remote", - ], -) - -[ - rb_unit_test( - name = file[:-8], - srcs = [file], - deps = [ - "//rb/lib/selenium/webdriver:common", - "//rb/lib/selenium/webdriver:remote", - ], - ) - for file in glob( - ["*_spec.rb"], - exclude = ["select_spec.rb"], - ) -] diff --git a/third_party/firebug/BUILD.bazel b/third_party/firebug/BUILD.bazel index 89139af6577d7..8f08322109d98 100644 --- a/third_party/firebug/BUILD.bazel +++ b/third_party/firebug/BUILD.bazel @@ -9,6 +9,6 @@ exports_files( visibility = [ "//java/test/org/openqa/selenium/firefox:__pkg__", "//py:__pkg__", - "//rb/spec/unit/selenium/webdriver/firefox:__pkg__", + "//rb/spec/unit:__pkg__", ], )