From 036da882e3754908e3d6629c3fc3de9a3858f62c Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Tue, 30 Apr 2024 07:36:59 -0700 Subject: [PATCH 01/10] [rb] Use Bazel JDK in remote tests --- rb/lib/selenium/server.rb | 3 ++- rb/spec/BUILD.bazel | 9 +++++++++ .../selenium/webdriver/spec_support/test_environment.rb | 7 +++++++ rb/spec/tests.bzl | 7 ++++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/rb/lib/selenium/server.rb b/rb/lib/selenium/server.rb index 560bc4e851c16..7d031f26af07d 100644 --- a/rb/lib/selenium/server.rb +++ b/rb/lib/selenium/server.rb @@ -183,6 +183,7 @@ def download_server(uri, destination) def initialize(jar, opts = {}) raise Errno::ENOENT, jar unless File.exist?(jar) + @java = opts.fetch(:java, 'java') @jar = jar @host = '127.0.0.1' @role = opts.fetch(:role, 'standalone') @@ -241,7 +242,7 @@ def process # extract any additional_args that start with -D as options properties = @additional_args.dup - @additional_args.delete_if { |arg| arg[/^-D/] } args = ['-jar', @jar, @role, '--port', @port.to_s] - server_command = ['java'] + properties + args + @additional_args + server_command = [@java] + properties + args + @additional_args cp = WebDriver::ChildProcess.build(*server_command) if @log.is_a?(String) diff --git a/rb/spec/BUILD.bazel b/rb/spec/BUILD.bazel index 57d8b4fecaa72..b2e2f82f1d024 100644 --- a/rb/spec/BUILD.bazel +++ b/rb/spec/BUILD.bazel @@ -117,3 +117,12 @@ rb_library( "//rb/spec/unit/selenium/webdriver/support:select", ], ) + +genrule( + name = "java-location", + srcs = [], + outs = ["java-location"], + cmd = "echo $(JAVA) > $@", + toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"], + visibility = ["//rb/spec:__subpackages__"], +) diff --git a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb index 49c29177b0d1b..0184404035df2 100644 --- a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb +++ b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb @@ -87,6 +87,7 @@ def app_server def remote_server @remote_server ||= Selenium::Server.new( remote_server_jar, + java: bazel_java, port: random_port, log_level: WebDriver.logger.debug? && 'FINE', background: true, @@ -95,6 +96,12 @@ def remote_server ) end + def bazel_java + return unless ENV.key?('WD_BAZEL_JAVA_LOCATION') + + File.expand_path(File.read(File.expand_path(ENV.fetch('WD_BAZEL_JAVA_LOCATION'))).chomp) + end + def reset_remote_server @remote_server&.stop @remote_server = nil diff --git a/rb/spec/tests.bzl b/rb/spec/tests.bzl index 809d62c714fd2..44b477c74d275 100644 --- a/rb/spec/tests.bzl +++ b/rb/spec/tests.bzl @@ -174,8 +174,13 @@ def rb_integration_test(name, srcs, deps = [], data = [], browsers = BROWSERS.ke data = BROWSERS[browser]["data"] + data + [ "//common/src/web", "//java/src/org/openqa/selenium/grid:selenium_server_deploy.jar", + "//rb/spec:java-location", + "@bazel_tools//tools/jdk:current_java_runtime", ], - env = BROWSERS[browser]["env"] | {"WD_SPEC_DRIVER": "remote"}, + env = BROWSERS[browser]["env"] | { + "WD_SPEC_DRIVER": "remote", + "WD_BAZEL_JAVA_LOCATION": "$(rootpath //rb/spec:java-location)", + }, main = "@bundle//bin:rspec", tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + [ "{}-remote".format(browser), From 50904820a69c47e47dbe58944bc1d811e8548b4c Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 1 May 2024 07:07:23 -0700 Subject: [PATCH 02/10] DEBUG: edge remote tests on win --- .github/workflows/bazel.yml | 4 + .github/workflows/ci-ruby.yml | 206 +++++++++++++++++----------------- 2 files changed, 107 insertions(+), 103 deletions(-) diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index 2c6a5a43381a4..73b70fbd61a86 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -162,6 +162,10 @@ jobs: - name: Setup Safari if: inputs.browser == 'safari' run: sudo safaridriver --enable + - name: Start SSH session + uses: mxschmitt/action-tmate@v3 + with: + limit-access-to-actor: false - name: Run Bazel run: ${{ inputs.run }} - name: Start SSH session diff --git a/.github/workflows/ci-ruby.yml b/.github/workflows/ci-ruby.yml index deb56b656f4c0..8653aab38f68e 100644 --- a/.github/workflows/ci-ruby.yml +++ b/.github/workflows/ci-ruby.yml @@ -5,110 +5,110 @@ on: workflow_dispatch: jobs: - build: - name: Build - uses: ./.github/workflows/bazel.yml - with: - name: Build - cache-key: rb-build - run: bazel build //rb:selenium-devtools //rb:selenium-webdriver + # build: + # name: Build + # uses: ./.github/workflows/bazel.yml + # with: + # name: Build + # cache-key: rb-build + # run: bazel build //rb:selenium-devtools //rb:selenium-webdriver - docs: - name: Documentation - needs: build - uses: ./.github/workflows/bazel.yml - with: - name: Documentation - cache-key: rb-docs - run: bazel run //rb:docs + # docs: + # name: Documentation + # needs: build + # uses: ./.github/workflows/bazel.yml + # with: + # name: Documentation + # cache-key: rb-docs + # run: bazel run //rb:docs - lint: - name: Lint - needs: build - uses: ./.github/workflows/bazel.yml - with: - name: Lint - cache-key: rb-lint - run: bazel test //rb:lint + # lint: + # name: Lint + # needs: build + # uses: ./.github/workflows/bazel.yml + # with: + # name: Lint + # cache-key: rb-lint + # run: bazel test //rb:lint - unit-tests: - name: Unit Tests - needs: build - uses: ./.github/workflows/bazel.yml - strategy: - fail-fast: false - matrix: - include: - - ruby-version: 3.0.6 - os: ubuntu - - ruby-version: 3.0.6 - os: windows - - ruby-version: 3.0.6 - os: macos - - ruby-version: 3.3.0 - os: ubuntu - - ruby-version: jruby-9.4.5.0 - os: ubuntu - - ruby-version: truffleruby-23.1.1 - os: ubuntu - with: - name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }}) - cache-key: rb-unit-test-${{ matrix.ruby-version }} - os: ${{ matrix.os }} - ruby-version: ${{ matrix.ruby-version }} - run: > - bazel test - --build_tests_only - --test_size_filters small - //rb/spec/... + # unit-tests: + # name: Unit Tests + # needs: build + # uses: ./.github/workflows/bazel.yml + # strategy: + # fail-fast: false + # matrix: + # include: + # - ruby-version: 3.0.6 + # os: ubuntu + # - ruby-version: 3.0.6 + # os: windows + # - ruby-version: 3.0.6 + # os: macos + # - ruby-version: 3.3.0 + # os: ubuntu + # - ruby-version: jruby-9.4.5.0 + # os: ubuntu + # - ruby-version: truffleruby-23.1.1 + # os: ubuntu + # with: + # name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }}) + # cache-key: rb-unit-test-${{ matrix.ruby-version }} + # os: ${{ matrix.os }} + # ruby-version: ${{ matrix.ruby-version }} + # run: > + # bazel test + # --build_tests_only + # --test_size_filters small + # //rb/spec/... - integration-tests-local: - name: Local Tests - needs: build - uses: ./.github/workflows/bazel.yml - strategy: - fail-fast: false - matrix: - browser: - - chrome - - edge - - firefox - - safari - os: - - ubuntu - - windows - - macos - exclude: - - browser: edge - os: ubuntu - - browser: edge - os: macos - - browser: safari - os: ubuntu - - browser: safari - os: windows - # TODO: Investigate why they are timing out - - browser: chrome - os: windows - - browser: edge - os: windows - with: - name: Local Tests (${{ matrix.browser }}, ${{ matrix.os }}) - browser: ${{ matrix.browser }} - cache-key: rb-${{ matrix.browser }}-test - os: ${{ matrix.os }} - run: > - bazel test - --build_tests_only - --flaky_test_attempts 3 - --local_test_jobs 1 - --test_size_filters large - --test_tag_filters ${{ matrix.browser }} - //rb/spec/... + # integration-tests-local: + # name: Local Tests + # needs: build + # uses: ./.github/workflows/bazel.yml + # strategy: + # fail-fast: false + # matrix: + # browser: + # - chrome + # - edge + # - firefox + # - safari + # os: + # - ubuntu + # - windows + # - macos + # exclude: + # - browser: edge + # os: ubuntu + # - browser: edge + # os: macos + # - browser: safari + # os: ubuntu + # - browser: safari + # os: windows + # # TODO: Investigate why they are timing out + # - browser: chrome + # os: windows + # - browser: edge + # os: windows + # with: + # name: Local Tests (${{ matrix.browser }}, ${{ matrix.os }}) + # browser: ${{ matrix.browser }} + # cache-key: rb-${{ matrix.browser }}-test + # os: ${{ matrix.os }} + # run: > + # bazel test + # --build_tests_only + # --flaky_test_attempts 3 + # --local_test_jobs 1 + # --test_size_filters large + # --test_tag_filters ${{ matrix.browser }} + # //rb/spec/... integration-tests-remote: name: Remote Tests - needs: build + # needs: build uses: ./.github/workflows/bazel.yml strategy: fail-fast: false @@ -116,12 +116,12 @@ jobs: include: - browser: edge os: windows - - browser: chrome - os: ubuntu - - browser: firefox - os: ubuntu - - browser: safari - os: macos + # - browser: chrome + # os: ubuntu + # - browser: firefox + # os: ubuntu + # - browser: safari + # os: macos with: name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }}) browser: ${{ matrix.browser }} From 75b6065f1456bedccfdfdd5d876fcbab17be6b66 Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 1 May 2024 08:20:34 -0700 Subject: [PATCH 03/10] [bazel] Update rules_jvm_external --- MODULE.bazel | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 2e2bfbda40af5..d8249a99f7121 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "contrib_rules_jvm", version = "0.24.0") bazel_dep(name = "platforms", version = "0.0.8") bazel_dep(name = "rules_dotnet", version = "0.14.0") bazel_dep(name = "rules_java", version = "7.4.0") -bazel_dep(name = "rules_jvm_external", version = "6.0") +bazel_dep(name = "rules_jvm_external", version = "6.1") bazel_dep(name = "rules_nodejs", version = "6.0.5") bazel_dep(name = "rules_oci", version = "1.0.0") bazel_dep(name = "rules_pkg", version = "0.9.1") @@ -124,16 +124,6 @@ use_repo(pip, "py_dev_requirements") register_toolchains("@pythons_hub//:all") -# https://github.com/bazelbuild/rules_jvm_external/pull/1079 -archive_override( - module_name = "rules_jvm_external", - integrity = "sha256-yS8Qes1PLbYbe10b1WSgl0Auqn/1Wlxg8O3wSr7a/Sg=", - patch_strip = 1, - patches = ["//java:rules_jvm_external_javadoc.patch"], - strip_prefix = "rules_jvm_external-f572a26116c7ef71d8842dd056c2605782f7be8d", - urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/f572a26116c7ef71d8842dd056c2605782f7be8d.tar.gz"], -) - java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains") use_repo( java_toolchains, From e5210359a65d2ee40a2d40cc08b1f7800f063cf5 Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 1 May 2024 08:20:49 -0700 Subject: [PATCH 04/10] [rb] Unfail Safari window tests on CI --- rb/spec/integration/selenium/webdriver/window_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rb/spec/integration/selenium/webdriver/window_spec.rb b/rb/spec/integration/selenium/webdriver/window_spec.rb index 3b820f801be75..5d01db255da4a 100644 --- a/rb/spec/integration/selenium/webdriver/window_spec.rb +++ b/rb/spec/integration/selenium/webdriver/window_spec.rb @@ -124,8 +124,7 @@ module WebDriver expect(new_size.height).to be > old_size.height end - it 'can minimize the window', except: [{browser: %i[chrome edge], headless: true}, - {browser: :safari, ci: :github}], + it 'can minimize the window', except: [{browser: %i[chrome edge], headless: true}], flaky: {browser: :chrome, platform: %i[macosx linux], ci: :github} do window.minimize expect { From dabf659ce53af839e4c01d8292ffbed493ac18f2 Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 1 May 2024 15:35:03 -0700 Subject: [PATCH 05/10] [rb] unfail some code --- .github/workflows/ci-ruby.yml | 81 +++++++++---------- .../spec_support/test_environment.rb | 2 - 2 files changed, 38 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ci-ruby.yml b/.github/workflows/ci-ruby.yml index 8653aab38f68e..67a315010ad6d 100644 --- a/.github/workflows/ci-ruby.yml +++ b/.github/workflows/ci-ruby.yml @@ -62,49 +62,44 @@ jobs: # --test_size_filters small # //rb/spec/... - # integration-tests-local: - # name: Local Tests - # needs: build - # uses: ./.github/workflows/bazel.yml - # strategy: - # fail-fast: false - # matrix: - # browser: - # - chrome - # - edge - # - firefox - # - safari - # os: - # - ubuntu - # - windows - # - macos - # exclude: - # - browser: edge - # os: ubuntu - # - browser: edge - # os: macos - # - browser: safari - # os: ubuntu - # - browser: safari - # os: windows - # # TODO: Investigate why they are timing out - # - browser: chrome - # os: windows - # - browser: edge - # os: windows - # with: - # name: Local Tests (${{ matrix.browser }}, ${{ matrix.os }}) - # browser: ${{ matrix.browser }} - # cache-key: rb-${{ matrix.browser }}-test - # os: ${{ matrix.os }} - # run: > - # bazel test - # --build_tests_only - # --flaky_test_attempts 3 - # --local_test_jobs 1 - # --test_size_filters large - # --test_tag_filters ${{ matrix.browser }} - # //rb/spec/... + integration-tests-local: + name: Local Tests + needs: build + uses: ./.github/workflows/bazel.yml + strategy: + fail-fast: false + matrix: + browser: + - chrome + - edge + # - firefox + # - safari + os: + # - ubuntu + - windows + # - macos + exclude: + - browser: edge + os: ubuntu + - browser: edge + os: macos + - browser: safari + os: ubuntu + - browser: safari + os: windows + with: + name: Local Tests (${{ matrix.browser }}, ${{ matrix.os }}) + browser: ${{ matrix.browser }} + cache-key: rb-${{ matrix.browser }}-test + os: ${{ matrix.os }} + run: > + bazel test + --build_tests_only + --flaky_test_attempts 3 + --local_test_jobs 1 + --test_size_filters large + --test_tag_filters ${{ matrix.browser }} + //rb/spec/... integration-tests-remote: name: Remote Tests diff --git a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb index 0184404035df2..f1864b587dfa3 100644 --- a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb +++ b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb @@ -250,7 +250,6 @@ def safari_preview_driver(**opts) def chrome_options(args: [], **opts) opts[:binary] ||= ENV['CHROME_BINARY'] if ENV.key?('CHROME_BINARY') args << '--headless=chrome' if ENV['HEADLESS'] - args << '--no-sandbox' args << '--disable-gpu' WebDriver::Options.chrome(browser_version: 'stable', args: args, **opts) end @@ -258,7 +257,6 @@ def chrome_options(args: [], **opts) def edge_options(args: [], **opts) opts[:binary] ||= ENV['EDGE_BINARY'] if ENV.key?('EDGE_BINARY') args << '--headless=chrome' if ENV['HEADLESS'] - args << '--no-sandbox' args << '--disable-gpu' WebDriver::Options.edge(browser_version: 'stable', args: args, **opts) end From 6f47929138f168cdb7eca5135cfabcf6fc27a1b5 Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 1 May 2024 15:36:08 -0700 Subject: [PATCH 06/10] foo --- .github/workflows/ci-ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-ruby.yml b/.github/workflows/ci-ruby.yml index 67a315010ad6d..7971991374afe 100644 --- a/.github/workflows/ci-ruby.yml +++ b/.github/workflows/ci-ruby.yml @@ -64,7 +64,7 @@ jobs: integration-tests-local: name: Local Tests - needs: build + # needs: build uses: ./.github/workflows/bazel.yml strategy: fail-fast: false From 6ede40b0eb5a5d9989b572ed8a47e38953ecb570 Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 1 May 2024 17:48:07 -0700 Subject: [PATCH 07/10] Revert --- .github/workflows/ci-ruby.yml | 126 +++++++++++++++++----------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/.github/workflows/ci-ruby.yml b/.github/workflows/ci-ruby.yml index 7971991374afe..a519b8eeb1913 100644 --- a/.github/workflows/ci-ruby.yml +++ b/.github/workflows/ci-ruby.yml @@ -5,66 +5,66 @@ on: workflow_dispatch: jobs: - # build: - # name: Build - # uses: ./.github/workflows/bazel.yml - # with: - # name: Build - # cache-key: rb-build - # run: bazel build //rb:selenium-devtools //rb:selenium-webdriver + build: + name: Build + uses: ./.github/workflows/bazel.yml + with: + name: Build + cache-key: rb-build + run: bazel build //rb:selenium-devtools //rb:selenium-webdriver - # docs: - # name: Documentation - # needs: build - # uses: ./.github/workflows/bazel.yml - # with: - # name: Documentation - # cache-key: rb-docs - # run: bazel run //rb:docs + docs: + name: Documentation + needs: build + uses: ./.github/workflows/bazel.yml + with: + name: Documentation + cache-key: rb-docs + run: bazel run //rb:docs - # lint: - # name: Lint - # needs: build - # uses: ./.github/workflows/bazel.yml - # with: - # name: Lint - # cache-key: rb-lint - # run: bazel test //rb:lint + lint: + name: Lint + needs: build + uses: ./.github/workflows/bazel.yml + with: + name: Lint + cache-key: rb-lint + run: bazel test //rb:lint - # unit-tests: - # name: Unit Tests - # needs: build - # uses: ./.github/workflows/bazel.yml - # strategy: - # fail-fast: false - # matrix: - # include: - # - ruby-version: 3.0.6 - # os: ubuntu - # - ruby-version: 3.0.6 - # os: windows - # - ruby-version: 3.0.6 - # os: macos - # - ruby-version: 3.3.0 - # os: ubuntu - # - ruby-version: jruby-9.4.5.0 - # os: ubuntu - # - ruby-version: truffleruby-23.1.1 - # os: ubuntu - # with: - # name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }}) - # cache-key: rb-unit-test-${{ matrix.ruby-version }} - # os: ${{ matrix.os }} - # ruby-version: ${{ matrix.ruby-version }} - # run: > - # bazel test - # --build_tests_only - # --test_size_filters small - # //rb/spec/... + unit-tests: + name: Unit Tests + needs: build + uses: ./.github/workflows/bazel.yml + strategy: + fail-fast: false + matrix: + include: + - ruby-version: 3.0.6 + os: ubuntu + - ruby-version: 3.0.6 + os: windows + - ruby-version: 3.0.6 + os: macos + - ruby-version: 3.3.0 + os: ubuntu + - ruby-version: jruby-9.4.5.0 + os: ubuntu + - ruby-version: truffleruby-23.1.1 + os: ubuntu + with: + name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }}) + cache-key: rb-unit-test-${{ matrix.ruby-version }} + os: ${{ matrix.os }} + ruby-version: ${{ matrix.ruby-version }} + run: > + bazel test + --build_tests_only + --test_size_filters small + //rb/spec/... integration-tests-local: name: Local Tests - # needs: build + needs: build uses: ./.github/workflows/bazel.yml strategy: fail-fast: false @@ -75,9 +75,9 @@ jobs: # - firefox # - safari os: - # - ubuntu + - ubuntu - windows - # - macos + - macos exclude: - browser: edge os: ubuntu @@ -103,7 +103,7 @@ jobs: integration-tests-remote: name: Remote Tests - # needs: build + needs: build uses: ./.github/workflows/bazel.yml strategy: fail-fast: false @@ -111,12 +111,12 @@ jobs: include: - browser: edge os: windows - # - browser: chrome - # os: ubuntu - # - browser: firefox - # os: ubuntu - # - browser: safari - # os: macos + - browser: chrome + os: ubuntu + - browser: firefox + os: ubuntu + - browser: safari + os: macos with: name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }}) browser: ${{ matrix.browser }} From 73265b3483f170aad4b8d973c6aa740dca41cb60 Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 1 May 2024 17:48:52 -0700 Subject: [PATCH 08/10] [rb] FIlter focused tests by default --- README.md | 1 - rb/spec/integration/selenium/webdriver/spec_helper.rb | 4 +++- rb/spec/unit/selenium/webdriver/spec_helper.rb | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d2b905c8108f9..6ebfda3fbf20f 100644 --- a/README.md +++ b/README.md @@ -370,7 +370,6 @@ Supported browsers: * `safari-preview` In addition to the [Common Options Examples](#common-options-examples), here are some additional Ruby specific ones: -* `--test_arg "-tfocus"` - test only [focused specs](https://relishapp.com/rspec/rspec-core/v/3-12/docs/filtering/inclusion-filters) * `--test_arg "-eTimeouts"` - test only specs which name include "Timeouts" * `--test_arg ""` - pass any extra RSpec arguments (see `bazel run @bundle//bin:rspec -- --help`) diff --git a/rb/spec/integration/selenium/webdriver/spec_helper.rb b/rb/spec/integration/selenium/webdriver/spec_helper.rb index 013bd8c65c791..bf0a507577ef1 100644 --- a/rb/spec/integration/selenium/webdriver/spec_helper.rb +++ b/rb/spec/integration/selenium/webdriver/spec_helper.rb @@ -45,7 +45,9 @@ GlobalTestEnv.quit_driver end - c.filter_run focus: true if ENV['focus'] + c.filter_run_when_matching :focus + c.run_all_when_everything_filtered = true + c.default_formatter = c.files_to_run.count > 1 ? 'progress' : 'doc' c.before do |example| guards = WebDriver::Support::Guards.new(example, bug_tracker: 'https://github.com/SeleniumHQ/selenium/issues') diff --git a/rb/spec/unit/selenium/webdriver/spec_helper.rb b/rb/spec/unit/selenium/webdriver/spec_helper.rb index 94badd92264e5..cb6cf23d9b00d 100644 --- a/rb/spec/unit/selenium/webdriver/spec_helper.rb +++ b/rb/spec/unit/selenium/webdriver/spec_helper.rb @@ -58,7 +58,9 @@ def with_env(hash) c.include Selenium::WebDriver::UnitSpecHelper - c.filter_run focus: true if ENV['focus'] + c.filter_run_when_matching :focus + c.run_all_when_everything_filtered = true + c.default_formatter = c.files_to_run.count > 1 ? 'progress' : 'doc' c.before do # https://github.com/ruby/debug/issues/797 From cd552207de5b0e9ad639d9428414f639589c4ce0 Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 1 May 2024 18:15:01 -0700 Subject: [PATCH 09/10] revert --- .github/workflows/bazel.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index 73b70fbd61a86..2c6a5a43381a4 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -162,10 +162,6 @@ jobs: - name: Setup Safari if: inputs.browser == 'safari' run: sudo safaridriver --enable - - name: Start SSH session - uses: mxschmitt/action-tmate@v3 - with: - limit-access-to-actor: false - name: Run Bazel run: ${{ inputs.run }} - name: Start SSH session From afaf1c27cdde831b710017be57618b3a4091ccee Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 1 May 2024 18:17:17 -0700 Subject: [PATCH 10/10] Revert --- .github/workflows/ci-ruby.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-ruby.yml b/.github/workflows/ci-ruby.yml index a519b8eeb1913..653034f947f45 100644 --- a/.github/workflows/ci-ruby.yml +++ b/.github/workflows/ci-ruby.yml @@ -72,8 +72,8 @@ jobs: browser: - chrome - edge - # - firefox - # - safari + - firefox + - safari os: - ubuntu - windows