[rb] Use Bazel JDK in remote tests

SeleniumHQ · May 2, 2024 · b456e60 · b456e60
1 parent 8688ad2
commit b456e60
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git 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
@@ -117,3 +117,13 @@ rb_library(
         "//rb/spec/unit/selenium/webdriver/support:select",
     ],
 )
+
+genrule(
+    name = "java-location",
+    srcs = [],
+    outs = ["java-location.txt"],
+    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
@@ -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
@@ -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_BAZEL_JAVA_LOCATION": "$(rootpath //rb/spec:java-location)",
+                "WD_SPEC_DRIVER": "remote",
+            },
             main = "@bundle//bin:rspec",
             tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + [
                 "{}-remote".format(browser),