[rb] Use server binary target

Author: p0deje

java/src/org/openqa/selenium/grid/BUILD.bazel

@@ -34,12 +34,16 @@ java_binary(
         "//common:linux": [
             "@linux_chrome//:chrome-linux64/chrome",
             "@linux_chromedriver//:chromedriver",
+            "@linux_edge//:opt/microsoft/msedge/microsoft-edge",
+            "@linux_edgedriver//:msedgedriver",
             "@linux_firefox//:firefox/firefox",
             "@linux_geckodriver//:geckodriver",
         ],
         "//common:macos": [
             "@mac_chrome//:Chrome.app",
             "@mac_chromedriver//:chromedriver",
+            "@mac_edge//:Edge.app",
+            "@mac_edgedriver//:msedgedriver",
             "@mac_firefox//:Firefox.app",
             "@mac_geckodriver//:geckodriver",
         ],
@@ -49,12 +53,16 @@ java_binary(
         "//common:linux": [
             "-Dwebdriver.chrome.driver=$(location @linux_chromedriver//:chromedriver)",
             "-Dwebdriver.chrome.binary=$(location @linux_chrome//:chrome-linux64/chrome)",
+            "-Dwebdriver.edge.binary=$(location @linux_edge//:opt/microsoft/msedge/microsoft-edge)",
+            "-Dwebdriver.edge.driver=$(location @linux_edgedriver//:msedgedriver)",
             "-Dwebdriver.gecko.driver=$(location @linux_geckodriver//:geckodriver)",
             "-Dwebdriver.firefox.bin=$(location @linux_firefox//:firefox/firefox)",
         ],
         "//common:macos": [
             "-Dwebdriver.chrome.driver=$(location @mac_chromedriver//:chromedriver)",
             "-Dwebdriver.chrome.binary=$(location @mac_chrome//:Chrome.app)/Contents/MacOS/Chrome",
+            "-Dwebdriver.edge.binary=\"$(location @mac_edge//:Edge.app)/Contents/MacOS/Microsoft Edge\"",
+            "-Dwebdriver.edge.driver=$(location @mac_edgedriver//:msedgedriver)",
             "-Dwebdriver.gecko.driver=$(location @mac_geckodriver//:geckodriver)",
             "-Dwebdriver.firefox.bin=$(location @mac_firefox//:Firefox.app)/Contents/MacOS/firefox",
         ],

rb/lib/selenium/server.rb

@@ -240,9 +240,14 @@ def stop_process
     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
+        properties = @additional_args.dup - @additional_args.delete_if { |arg| arg[/^(--jvm_flag=)?-D/] }
+        server_command = if @jar.end_with?('.jar')
+                           [@java, *properties, '-jar', @jar]
+                         else
+                           [@jar, *properties]
+                         end
+        args = [@role, '--port', @port.to_s]
+        server_command += args + @additional_args
         cp = WebDriver::ChildProcess.build(*server_command)
 
         if @log.is_a?(String)

rb/spec/BUILD.bazel

@@ -118,12 +118,3 @@ 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__"],
-)

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

@@ -89,18 +89,17 @@ def app_server
 
         def remote_server
           args = if ENV.key?('CHROMEDRIVER_BINARY')
-                   ["-Dwebdriver.chrome.driver=#{ENV['CHROMEDRIVER_BINARY']}"]
+                   ["--jvm_flag=-Dwebdriver.chrome.driver=#{ENV['CHROMEDRIVER_BINARY']}"]
                  elsif ENV.key?('MSEDGEDRIVER_BINARY')
-                   ["-Dwebdriver.edge.driver=#{ENV['MSEDGEDRIVER_BINARY']}"]
+                   ["--jvm_flag=-Dwebdriver.edge.driver=#{ENV['MSEDGEDRIVER_BINARY']}"]
                  elsif ENV.key?('GECKODRIVER_BINARY')
-                   ["-Dwebdriver.gecko.driver=#{ENV['GECKODRIVER_BINARY']}"]
+                   ["--jvm_flag=-Dwebdriver.gecko.driver=#{ENV['GECKODRIVER_BINARY']}"]
                  else
                    %w[--selenium-manager true --enable-managed-downloads true]
                  end
 
           @remote_server ||= Selenium::Server.new(
             remote_server_jar,
-            java: bazel_java,
             port: random_port,
             log_level: WebDriver.logger.debug? && 'FINE',
             background: true,
@@ -109,12 +108,6 @@ 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 rbe?
           Dir.pwd.start_with?('/mnt/engflow')
         end
@@ -130,6 +123,8 @@ def remote_server?
         end
 
         def remote_server_jar
+          return ENV['WD_BAZEL_SERVER_LOCATION'] if ENV.key?('WD_BAZEL_SERVER_LOCATION')
+
           jar = 'java/src/org/openqa/selenium/grid/selenium_server_deploy.jar'
           test_jar = Pathname.new(Dir.pwd).join(jar)
           built_jar = root.join("bazel-bin/#{jar}")

rb/spec/tests.bzl

@@ -173,13 +173,11 @@ 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",
-                "//rb/spec:java-location",
-                "@bazel_tools//tools/jdk:current_java_runtime",
+                "//java/src/org/openqa/selenium/grid:selenium_server",
             ],
             env = BROWSERS[browser]["env"] | {
-                "WD_BAZEL_JAVA_LOCATION": "$(rootpath //rb/spec:java-location)",
                 "WD_SPEC_DRIVER": "remote",
+                "WD_BAZEL_SERVER_LOCATION": "$(rootpath //java/src/org/openqa/selenium/grid:selenium_server)",
             },
             main = "@bundle//bin:rspec",
             tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + ["{}-remote".format(browser)],