diff --git a/java/browsers.bzl b/java/browsers.bzl index 1fdc07c3412dc..447e740c03864 100644 --- a/java/browsers.bzl +++ b/java/browsers.bzl @@ -8,6 +8,16 @@ chromedriver_jvm_flags = select({ "//conditions:default": [], }) +chromedriver_beta_jvm_flags = select({ + "@selenium//common:use_pinned_linux_chrome": [ + "-Dwebdriver.chrome.driver=$(location @linux_beta_chromedriver//:chromedriver)", + ], + "@selenium//common:use_pinned_macos_chrome": [ + "-Dwebdriver.chrome.driver=$(location @mac_beta_chromedriver//:chromedriver)", + ], + "//conditions:default": [], +}) + chrome_jvm_flags = select({ "@selenium//common:use_pinned_linux_chrome": [ "-Dwebdriver.chrome.binary=$(location @linux_chrome//:chrome-linux64/chrome)", @@ -26,6 +36,24 @@ chrome_jvm_flags = select({ "//conditions:default": [], }) + chromedriver_jvm_flags +chrome_beta_jvm_flags = select({ + "@selenium//common:use_pinned_linux_chrome": [ + "-Dwebdriver.chrome.binary=$(location @linux_beta_chrome//:chrome-linux64/chrome)", + ], + "@selenium//common:use_pinned_macos_chrome": [ + "-Dwebdriver.chrome.binary=$(location @mac_beta_chrome//:Chrome.app)/Contents/MacOS/Chrome", + ], + "@selenium//common:use_local_chromedriver": [], + "//conditions:default": [ + "-Dselenium.skiptest=false", + ], +}) + select({ + "@selenium//common:use_headless_browser": [ + "-Dwebdriver.headless=true", + ], + "//conditions:default": [], +}) + chromedriver_beta_jvm_flags + edgedriver_jvm_flags = select({ "@selenium//common:use_pinned_linux_edge": [ "-Dwebdriver.edge.driver=$(location @linux_edgedriver//:msedgedriver)", diff --git a/java/private/selenium_test.bzl b/java/private/selenium_test.bzl index 625011feb70aa..78c48292b6a1a 100644 --- a/java/private/selenium_test.bzl +++ b/java/private/selenium_test.bzl @@ -1,6 +1,7 @@ load( "//common:browsers.bzl", "COMMON_TAGS", + "chrome_beta_data", "chrome_data", "edge_data", "firefox_beta_data", @@ -8,6 +9,7 @@ load( ) load( "//java:browsers.bzl", + "chrome_beta_jvm_flags", "chrome_jvm_flags", "edge_jvm_flags", "firefox_beta_jvm_flags", @@ -24,6 +26,12 @@ BROWSERS = { "data": chrome_data, "tags": COMMON_TAGS + ["chrome"], }, + "chrome-beta": { + "deps": ["//java/src/org/openqa/selenium/chrome"], + "jvm_flags": ["-Dselenium.browser=chrome"] + chrome_beta_jvm_flags, + "data": chrome_beta_data, + "tags": COMMON_TAGS + ["chrome", "chrome-beta"], + }, "edge": { "deps": ["//java/src/org/openqa/selenium/edge"], "jvm_flags": ["-Dselenium.browser=edge"] + edge_jvm_flags,