Re-make of the beta-chrome support PR

aguspe · aguspe · commit c44e578861ee · 2025-06-07T19:40:51.000+02:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -370,13 +370,17 @@ use_repo(
 pin_browsers_extension = use_extension("//common:repositories.bzl", "pin_browsers_extension")
 use_repo(
     pin_browsers_extension,
+    "linux_beta_chrome",
+    "linux_beta_chromedriver",
     "linux_beta_firefox",
     "linux_chrome",
     "linux_chromedriver",
     "linux_edge",
     "linux_edgedriver",
     "linux_firefox",
     "linux_geckodriver",
+    "mac_beta_chrome",
+    "mac_beta_chromedriver",
     "mac_beta_firefox",
     "mac_chrome",
     "mac_chromedriver",
diff --git a/common/browsers.bzl b/common/browsers.bzl
@@ -83,3 +83,25 @@ firefox_beta_data = select({
     ],
     "//conditions:default": [],
 }) + geckodriver_data
+
+chromedriver_beta_data = select({
+    "@selenium//common:use_pinned_linux_chrome": [
+        "@linux_beta_chromedriver//:chromedriver",
+    ],
+    "@selenium//common:use_pinned_macos_chrome": [
+        "@mac_beta_chromedriver//:chromedriver",
+    ],
+    "@selenium//common:use_local_chromedriver": ["@selenium//common:chromedriver"],
+    "//conditions:default": [],
+})
+
+chrome_beta_data = select({
+    "@selenium//common:use_pinned_linux_chrome": [
+        "@linux_beta_chrome//:files",
+        "@linux_beta_chrome//:chrome-linux64/chrome",
+    ],
+    "@selenium//common:use_pinned_macos_chrome": [
+        "@mac_beta_chrome//:Chrome.app",
+    ],
+    "//conditions:default": [],
+}) + chromedriver_beta_data
diff --git a/common/repositories.bzl b/common/repositories.bzl
@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b5/linux-x86_64/en-US/firefox-140.0b5.tar.xz",
-        sha256 = "c3a9510169f3c4dae1595cd5da18332ef333ec99f309d2450b4f5718b68c321a",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b6/linux-x86_64/en-US/firefox-140.0b6.tar.xz",
+        sha256 = "ae3fc88078ea41f85a24ab6c4f865b476ceebef4c3a2117e02607c7afdc191a8",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b5/mac/en-US/Firefox%20140.0b5.dmg",
-        sha256 = "795fdcf2076aef760b0276620ad8c0a3357737574e8a5a99bc0c44fdd3c5c90a",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b6/mac/en-US/Firefox%20140.0b6.dmg",
+        sha256 = "cd0326af92ca17e5121c916edfe10e913ec39d8ccd16c079207effa7d4aaab75",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
 
     pkg_archive(
         name = "mac_edge",
-        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/1b7ce123-70b7-486d-a381-9e418df1feb8/MicrosoftEdge-137.0.3296.62.pkg",
-        sha256 = "e2c537663569fc81ff14f3278495e071e7b1e5d8c759b7bcf17f7d807403f957",
+        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/881a4aef-792c-4d81-a76f-3cf546510d68/MicrosoftEdge-137.0.3296.68.pkg",
+        sha256 = "4de62ee93ba67db666597807fc991e749f073af07a577dfdfc56dbf19409c87d",
         move = {
-            "MicrosoftEdge-137.0.3296.62.pkg/Payload/Microsoft Edge.app": "Edge.app",
+            "MicrosoftEdge-137.0.3296.68.pkg/Payload/Microsoft Edge.app": "Edge.app",
         },
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
 
     deb_archive(
         name = "linux_edge",
-        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_137.0.3296.62-1_amd64.deb",
-        sha256 = "f5f1e57029fb8f85baa5441e9a45aeeb7aa6a6f3759d3c458c1b15297ed115bc",
+        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_137.0.3296.68-1_amd64.deb",
+        sha256 = "76099017ace977c74060aa134a289d93c554e9d67f6561039580fdd483da0c41",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
 
     http_archive(
         name = "linux_edgedriver",
-        url = "https://msedgedriver.azureedge.net/137.0.3296.62/edgedriver_linux64.zip",
-        sha256 = "9857afcbc78f94cd68ddae1f12f2a77687a4216fbcac78571580ef8a8f09f924",
+        url = "https://msedgedriver.azureedge.net/137.0.3296.68/edgedriver_linux64.zip",
+        sha256 = "0605ae9e651befd470826ff3c3baf74b3d40599c25f1edd60b09d10f5b97144a",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
 
     http_archive(
         name = "mac_edgedriver",
-        url = "https://msedgedriver.azureedge.net/137.0.3296.62/edgedriver_mac64.zip",
-        sha256 = "eb26a678e9fd90142fe23b528b9f2a2bb821c8005bbd95e686c26b525ce0b6bc",
+        url = "https://msedgedriver.azureedge.net/137.0.3296.68/edgedriver_mac64.zip",
+        sha256 = "29b331d365361f0e9ef68c2e573f33ca895b3fa607823a66de9d6f226dbe4a54",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -218,7 +218,6 @@ js_library(
 )
 """,
     )
-
     http_archive(
         name = "mac_chrome",
         url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.68/mac-x64/chrome-mac-x64.zip",
@@ -240,7 +239,6 @@ js_library(
 )
 """,
     )
-
     http_archive(
         name = "linux_chromedriver",
         url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.68/linux64/chromedriver-linux64.zip",
@@ -270,6 +268,84 @@ package(default_visibility = ["//visibility:public"])
 
 exports_files(["chromedriver"])
 
+js_library(
+    name = "chromedriver-js",
+    data = ["chromedriver"],
+)
+""",
+    )
+
+    http_archive(
+        name = "linux_beta_chrome",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.15/linux64/chrome-linux64.zip",
+        sha256 = "e4bb8769b613eacd7cc40e48f3f63d96de9e9ee642360b4a79bedd502291c544",
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "files",
+    srcs = glob(["**/*"]),
+)
+
+exports_files(["chrome-linux64/chrome"])
+
+js_library(
+    name = "chrome-js",
+    data = [":files"],
+)
+""",
+    )
+    http_archive(
+        name = "mac_beta_chrome",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.15/mac-x64/chrome-mac-x64.zip",
+        sha256 = "46dbfe39930cd3a2a45bc85a70bb49c291c258fde5be4d3d4deecc8e3181ae2f",
+        strip_prefix = "chrome-mac-x64",
+        patch_cmds = [
+            "mv 'Google Chrome for Testing.app' Chrome.app",
+            "mv 'Chrome.app/Contents/MacOS/Google Chrome for Testing' Chrome.app/Contents/MacOS/Chrome",
+        ],
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+exports_files(["Chrome.app"])
+
+js_library(
+    name = "chrome-js",
+    data = glob(["Chrome.app/**/*"]),
+)
+""",
+    )
+    http_archive(
+        name = "linux_beta_chromedriver",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.15/linux64/chromedriver-linux64.zip",
+        sha256 = "b180e7569aa10a10e5b112b2b6cc21d126499122eaba0e90d264713285cc9104",
+        strip_prefix = "chromedriver-linux64",
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+exports_files(["chromedriver"])
+
+js_library(
+    name = "chromedriver-js",
+    data = ["chromedriver"],
+)
+""",
+    )
+
+    http_archive(
+        name = "mac_beta_chromedriver",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.15/mac-x64/chromedriver-mac-x64.zip",
+        sha256 = "fda50dbab46115e2185cae0f3eeb8526c3f95175b0d4f7f7871aaf1e63590d5c",
+        strip_prefix = "chromedriver-mac-x64",
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+exports_files(["chromedriver"])
+
 js_library(
     name = "chromedriver-js",
     data = ["chromedriver"],
diff --git a/rb/spec/integration/BUILD.bazel b/rb/spec/integration/BUILD.bazel
@@ -2,6 +2,7 @@ package(default_visibility = ["//rb/spec/integration:__subpackages__"])
 
 BROWSERS = [
     "chrome",
+    "chrome-beta",
     "edge",
     "firefox",
     "ie",
diff --git a/rb/spec/integration/selenium/webdriver/chrome/BUILD.bazel b/rb/spec/integration/selenium/webdriver/chrome/BUILD.bazel
@@ -4,7 +4,12 @@ load("//rb/spec:tests.bzl", "rb_integration_test")
     rb_integration_test(
         name = file[:-8],
         srcs = [file],
-        browsers = ["chrome"],  # No need to run in other browsers.
+        # No need to run in other browsers.
+        browsers = [
+            "chrome",
+            "chrome-beta",
+        ],
+        data = ["//common/extensions"],
     )
     for file in glob(["*_spec.rb"])
 ]
diff --git a/rb/spec/tests.bzl b/rb/spec/tests.bzl
@@ -2,6 +2,7 @@ load("@rules_ruby//ruby:defs.bzl", "rb_library", "rb_test")
 load(
     "//common:browsers.bzl",
     "COMMON_TAGS",
+    "chrome_beta_data",
     "chrome_data",
     "edge_data",
     "firefox_beta_data",
@@ -32,6 +33,30 @@ BROWSERS = {
             "//conditions:default": {},
         }),
     },
+    "chrome-beta": {
+        "data": chrome_beta_data,
+        "deps": ["//rb/lib/selenium/webdriver:chrome"],
+        "tags": [],
+        "target_compatible_with": [],
+        "env": {
+            "WD_REMOTE_BROWSER": "chrome",
+            "WD_SPEC_DRIVER": "chrome",
+            "WD_BROWSER_VERSION": "beta",
+        } | select({
+            "@selenium//common:use_pinned_linux_chrome": {
+                "CHROME_BINARY": "$(location @linux_beta_chrome//:chrome-linux64/chrome)",
+                "CHROMEDRIVER_BINARY": "$(location @linux_beta_chromedriver//:chromedriver)",
+            },
+            "@selenium//common:use_pinned_macos_chrome": {
+                "CHROME_BINARY": "$(location @mac_beta_chrome//:Chrome.app)/Contents/MacOS/Chrome",
+                "CHROMEDRIVER_BINARY": "$(location @mac_beta_chromedriver//:chromedriver)",
+            },
+            "//conditions:default": {},
+        }) | select({
+            "@selenium//common:use_headless_browser": {"HEADLESS": "true"},
+            "//conditions:default": {},
+        }),
+    },
     "edge": {
         "data": edge_data,
         "deps": ["//rb/lib/selenium/webdriver:edge"],
diff --git a/scripts/pinned_browsers.py b/scripts/pinned_browsers.py

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,12 @@ load("//rb/spec:tests.bzl", "rb_integration_test")`
`4`	`4`	`rb_integration_test(`
`5`	`5`	`name = file[:-8],`
`6`	`6`	`srcs = [file],`
`7`		`- browsers = ["chrome"], # No need to run in other browsers.`
	`7`	`+ # No need to run in other browsers.`
	`8`	`+ browsers = [`
	`9`	`+ "chrome",`
	`10`	`+ "chrome-beta",`
	`11`	`+ ],`
	`12`	`+ data = ["//common/extensions"],`
`8`	`13`	`)`
`9`	`14`	`for file in glob(["*_spec.rb"])`
`10`	`15`	`]`