Skip to content
Merged
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
f7ac714
Add support for beta chrome
aguspe Mar 13, 2025
f4e7b1a
Remove chrome beta from test
aguspe Mar 13, 2025
def4e92
Try by modified the pinned browsers
aguspe Mar 14, 2025
5ff5d7f
Fix formatting
aguspe Mar 14, 2025
640b190
Fix formatting
aguspe Mar 14, 2025
054de22
Fix formatting
aguspe Mar 14, 2025
a423f49
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Mar 14, 2025
34bbeea
Add pipeline support again
aguspe Mar 17, 2025
606aecc
Merge remote-tracking branch 'origin/rb_add_support_for_chrome_beta' …
aguspe Mar 17, 2025
14a691a
Add chrome data
aguspe Mar 17, 2025
f0e6b29
Add integration to run in chrome beta
aguspe Mar 17, 2025
1e8366d
Add guard for beta chrome
aguspe Mar 17, 2025
3ad7ef4
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Mar 20, 2025
ee59b39
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Mar 20, 2025
4ca99d3
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Mar 26, 2025
779e8d3
Merge branch 'trunk' of github.com:aguspe/selenium into rb_add_suppor…
aguspe Mar 26, 2025
08b31b2
change test environment
aguspe Mar 27, 2025
5ecb86c
update MODULE.bazel
aguspe Mar 27, 2025
75ea1cf
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Mar 27, 2025
7858fa5
Fix formatting issues
aguspe Mar 27, 2025
43a9fe1
Merge remote-tracking branch 'origin/rb_add_support_for_chrome_beta' …
aguspe Mar 27, 2025
f0bbbd1
Add browsers
aguspe Mar 27, 2025
94f9a5e
fix formatting offenses
aguspe Mar 27, 2025
ef6824f
Try beta chrome again
aguspe Mar 28, 2025
f18e4f8
trying with chromedriver beta data
aguspe Mar 28, 2025
f78ccbc
Fix reference error
aguspe Mar 28, 2025
344fef5
Try updating the .bazelrc file
aguspe Mar 29, 2025
bec99e1
Correct typo
aguspe Mar 31, 2025
9bbfb38
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Mar 31, 2025
a5c4900
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Apr 7, 2025
5012e1f
merge trunk
aguspe Apr 7, 2025
ce38cb2
Starting addressing review comments
aguspe Apr 7, 2025
4b3ce4c
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Apr 8, 2025
1907162
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Apr 10, 2025
9f407bb
Use version to set the webdriver version
aguspe Apr 10, 2025
e847941
Add beta to tests
aguspe Apr 10, 2025
31e91ed
Fix format
aguspe Apr 10, 2025
6748c29
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Apr 12, 2025
a4931bb
Remove version env variable from firefox beta
aguspe Apr 12, 2025
ece1dc4
Merge branch 'trunk' of github.com:aguspe/selenium into rb_add_suppor…
aguspe Apr 22, 2025
f51ab8e
Rollback env variable
aguspe Apr 22, 2025
ab9d5b3
Correct formatting
aguspe Apr 22, 2025
77d6767
Revert "Use tax.xz for Firefox package starting in version 135 in pin…
aguspe Apr 22, 2025
07618eb
Revert formatting changes
aguspe Apr 22, 2025
3a5fee6
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Apr 29, 2025
98bbc73
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe Apr 30, 2025
1ec108e
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 1, 2025
d6e3947
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 2, 2025
3ecda45
Update pinned browsers
aguspe May 2, 2025
2ea4792
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 2, 2025
5bb4129
Add download of beta_chrome on pinned browsers
aguspe May 2, 2025
f347cdb
Merge remote-tracking branch 'origin/rb_add_support_for_chrome_beta' …
aguspe May 2, 2025
6fb6243
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 3, 2025
7fe64ac
Merge branch 'trunk' into rb_add_support_for_chrome_beta
titusfortner May 5, 2025
6e21f39
Merge branch 'trunk' into rb_add_support_for_chrome_beta
titusfortner May 6, 2025
261f2c8
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 16, 2025
7babc22
merge trunk
aguspe May 23, 2025
7a2ab2d
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 24, 2025
6d74604
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 29, 2025
8e5b869
Pinned browsers script automatically generates beta chrome
aguspe May 29, 2025
d1af92a
Merge remote-tracking branch 'origin/rb_add_support_for_chrome_beta' …
aguspe May 29, 2025
201252e
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 29, 2025
0c0e879
Fix formatting
aguspe May 30, 2025
ed84323
Merge remote-tracking branch 'origin/rb_add_support_for_chrome_beta' …
aguspe May 30, 2025
c4d31ef
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 30, 2025
b674937
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 30, 2025
4679e55
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 30, 2025
59b60de
Merge branch 'trunk' into rb_add_support_for_chrome_beta
aguspe May 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -366,13 +366,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",
Expand Down
22 changes: 22 additions & 0 deletions common/browsers.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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
80 changes: 78 additions & 2 deletions common/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ js_library(
)
""",
)

http_archive(
name = "mac_chrome",
url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.40/mac-x64/chrome-mac-x64.zip",
Expand All @@ -240,7 +239,6 @@ js_library(
)
""",
)

http_archive(
name = "linux_chromedriver",
url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.40/linux64/chromedriver-linux64.zip",
Expand Down Expand Up @@ -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/137.0.7151.6/linux64/chrome-linux64.zip",
sha256 = "1c304daed9edf8d4b5b57645e6cccf227bcc7664595b369879f89ca34d2509ac",
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/137.0.7151.6/mac-x64/chrome-mac-x64.zip",
sha256 = "c6f3a04ea911682abcce470310433efb75ef4063ba9f02df0a22df89344947cb",
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/137.0.7151.6/linux64/chromedriver-linux64.zip",
sha256 = "0d5ba6533e60b44b39f41b4313696b41bb7b466f29aa00cb82df030392559854",
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/137.0.7151.6/mac-x64/chromedriver-mac-x64.zip",
sha256 = "d01e48e534b48ab1f6401642720eec95773b069ad8a3042969d1fd708a4fb6c2",
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"],
Expand Down
1 change: 1 addition & 0 deletions rb/spec/integration/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package(default_visibility = ["//rb/spec/integration:__subpackages__"])

BROWSERS = [
"chrome",
"chrome-beta",
"edge",
"firefox",
"ie",
Expand Down
7 changes: 6 additions & 1 deletion rb/spec/integration/selenium/webdriver/chrome/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
]
25 changes: 25 additions & 0 deletions rb/spec/tests.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"],
Expand Down
Loading