[rb] Ensure server is started with Bazel JDK

SeleniumHQ · Apr 26, 2024 · a57778f · a57778f
1 parent f2b6813
commit a57778f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/rb/lib/selenium/server.rb b/rb/lib/selenium/server.rb
@@ -240,8 +240,12 @@ def process
       @process ||= begin
         # 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
+        args = [@role, '--port', @port.to_s]
+        if ENV.key?('SELENIUM_BAZEL_SERVER_LAUNCHER')
+          server_command = [ENV['SELENIUM_BAZEL_SERVER_LAUNCHER']] + properties + args + @additional_args
+        else
+          server_command = ['java'] + properties + ['-jar', @jar] + args + @additional_args
+        end
         cp = WebDriver::ChildProcess.build(*server_command)
 
         if @log.is_a?(String)

diff --git a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb
@@ -34,6 +34,10 @@ def initialize
           @driver = ENV.fetch('WD_SPEC_DRIVER', 'chrome').tr('-', '_').to_sym
           @driver_instance = nil
           @remote_server = nil
+
+          if ENV.key?('SELENIUM_BAZEL_SERVER_LAUNCHER')
+            ENV['SELENIUM_BAZEL_SERVER_LAUNCHER'] = ENV.fetch('SELENIUM_BAZEL_SERVER_LAUNCHER', '').split(' ').first
+          end
         end
 
         def print_env

diff --git a/rb/spec/tests.bzl b/rb/spec/tests.bzl
@@ -173,9 +173,12 @@ def rb_integration_test(name, srcs, deps = [], data = [], browsers = BROWSERS.ke
             args = ["rb/spec/"],
             data = BROWSERS[browser]["data"] + data + [
                 "//common/src/web",
-                "//java/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
+                "//java/src/org/openqa/selenium/grid:selenium_server",
             ],
-            env = BROWSERS[browser]["env"] | {"WD_SPEC_DRIVER": "remote"},
+            env = BROWSERS[browser]["env"] | {
+                "SELENIUM_BAZEL_SERVER_LAUNCHER": "'$(rootpaths //java/src/org/openqa/selenium/grid:selenium_server)'",
+                "WD_SPEC_DRIVER": "remote",
+            },
             main = "@bundle//bin:rspec",
             tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + [
                 "{}-remote".format(browser),