Skip to content

Commit 276a691

Browse files
committed
Merge remote-tracking branch 'origin/trunk' into release-preparation-4.26.0
Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
2 parents 8a57e64 + 5be3015 commit 276a691

File tree

6 files changed

+117
-52
lines changed

6 files changed

+117
-52
lines changed

common/repositories.bzl

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ def pin_browsers():
1111

1212
http_archive(
1313
name = "linux_firefox",
14-
url = "https://ftp.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/en-US/firefox-131.0.3.tar.bz2",
15-
sha256 = "fcd1e93221074a7b44445a99d81ea26e95fdc4c7e67000e748dab93cb12c2a13",
14+
url = "https://ftp.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/en-US/firefox-132.0.tar.bz2",
15+
sha256 = "e3a6f9a68ac72f5df01fac8c97c6de1a353af4b350b8c8b49b2c26c1fbbb2538",
1616
build_file_content = """
1717
load("@aspect_rules_js//js:defs.bzl", "js_library")
1818
package(default_visibility = ["//visibility:public"])
@@ -33,8 +33,8 @@ js_library(
3333

3434
dmg_archive(
3535
name = "mac_firefox",
36-
url = "https://ftp.mozilla.org/pub/firefox/releases/131.0.3/mac/en-US/Firefox%20131.0.3.dmg",
37-
sha256 = "7a4714e20b4f2099056e4c79921291256278174273d57bff09771f98774ff513",
36+
url = "https://ftp.mozilla.org/pub/firefox/releases/132.0/mac/en-US/Firefox%20132.0.dmg",
37+
sha256 = "5924171ce774ba8d102ddb45c573ff8acd4e0c289b62597f941ca58d79289704",
3838
build_file_content = """
3939
load("@aspect_rules_js//js:defs.bzl", "js_library")
4040
package(default_visibility = ["//visibility:public"])
@@ -50,8 +50,8 @@ js_library(
5050

5151
http_archive(
5252
name = "linux_beta_firefox",
53-
url = "https://ftp.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-US/firefox-132.0b9.tar.bz2",
54-
sha256 = "702b2e7227e8ec775da12f293381e41a22623818a4af51040b71843c07aadf47",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/en-US/firefox-133.0b1.tar.bz2",
54+
sha256 = "e61434729b6c0be2cc1d27b6c1847f54c1b228a49a4480260de1e10ca2a115c2",
5555
build_file_content = """
5656
load("@aspect_rules_js//js:defs.bzl", "js_library")
5757
package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
7272

7373
dmg_archive(
7474
name = "mac_beta_firefox",
75-
url = "https://ftp.mozilla.org/pub/firefox/releases/132.0b9/mac/en-US/Firefox%20132.0b9.dmg",
76-
sha256 = "ea881ca8534abe144005d49415e82b3c4c36db9d81d1ab0461e941e75d8593a6",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/133.0b1/mac/en-US/Firefox%20133.0b1.dmg",
76+
sha256 = "999529fe32c8630c234b6cff09a204a1c178ca8fc1a4e17c66097b943a87ebc4",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -166,7 +166,7 @@ js_library(
166166
http_archive(
167167
name = "linux_edgedriver",
168168
url = "https://msedgedriver.azureedge.net/130.0.2849.56/edgedriver_linux64.zip",
169-
sha256 = "f50cd2eff74a3f8a311d16956277e4755efa4cac1cba604994cba1232318ea9e",
169+
sha256 = "c5aa82d87750a6f49b741790a432194ff91d0a232c54eb5507a526f45146f440",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
172172
package(default_visibility = ["//visibility:public"])
@@ -183,7 +183,7 @@ js_library(
183183
http_archive(
184184
name = "mac_edgedriver",
185185
url = "https://msedgedriver.azureedge.net/130.0.2849.56/edgedriver_mac64.zip",
186-
sha256 = "2eace618407198ede1831fdb443d8642793e41e81aba2eafdd9f6bc469300a01",
186+
sha256 = "97141db0a53b22356094ff4d7a806a19ab816499366539e633a32fc4af8da2a3",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])
@@ -199,8 +199,8 @@ js_library(
199199

200200
http_archive(
201201
name = "linux_chrome",
202-
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.69/linux64/chrome-linux64.zip",
203-
sha256 = "f789d53911a50cfa4a2bc1f09cde57567247f52515436d92b1aa9de93c2787d0",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.91/linux64/chrome-linux64.zip",
203+
sha256 = "9190cc0540c9f59df5e81aae48d0e048dca6f7343266cee17d956931d844b1e7",
204204
build_file_content = """
205205
load("@aspect_rules_js//js:defs.bzl", "js_library")
206206
package(default_visibility = ["//visibility:public"])
@@ -221,8 +221,8 @@ js_library(
221221

222222
http_archive(
223223
name = "mac_chrome",
224-
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.69/mac-x64/chrome-mac-x64.zip",
225-
sha256 = "abce96f50913f8c98d201f03d7464f8e526a32d149c9f40b6b51dc8c06d3deed",
224+
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.91/mac-x64/chrome-mac-x64.zip",
225+
sha256 = "1706e6f0671a78fa75d9567577c38e7d6848da9144c83ccba80fc840d2347cd3",
226226
strip_prefix = "chrome-mac-x64",
227227
patch_cmds = [
228228
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -243,8 +243,8 @@ js_library(
243243

244244
http_archive(
245245
name = "linux_chromedriver",
246-
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.69/linux64/chromedriver-linux64.zip",
247-
sha256 = "90fe8dedf33eefe4b72704f626fa9f5834427c042235cfeb4251f18c9f0336ea",
246+
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.91/linux64/chromedriver-linux64.zip",
247+
sha256 = "a8c94cea296c22a9bc1b928b138b8655bfecd9b372652c909b1b2af841ca5ff7",
248248
strip_prefix = "chromedriver-linux64",
249249
build_file_content = """
250250
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -261,8 +261,8 @@ js_library(
261261

262262
http_archive(
263263
name = "mac_chromedriver",
264-
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.69/mac-x64/chromedriver-mac-x64.zip",
265-
sha256 = "4997e5f774dc683f63e7dcc67e53c59878083f935a4bc6e00e2de5dd24511622",
264+
url = "https://storage.googleapis.com/chrome-for-testing-public/130.0.6723.91/mac-x64/chromedriver-mac-x64.zip",
265+
sha256 = "e2e137e1ff7d7d3886e4526ad319c4a1da90bcd4f601af247ac60ec58e38c570",
266266
strip_prefix = "chromedriver-mac-x64",
267267
build_file_content = """
268268
load("@aspect_rules_js//js:defs.bzl", "js_library")

rb/spec/integration/selenium/webdriver/remote/driver_spec.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,12 @@ module Remote
8383

8484
it 'errors when not set', {except: {browser: :firefox, reason: 'grid always sets true and firefox returns it'},
8585
exclude: {browser: :safari, reason: 'grid hangs'}} do
86-
expect {
87-
driver.downloadable_files
88-
}.to raise_exception(Error::WebDriverError,
89-
'You must enable downloads in order to work with downloadable files.')
86+
reset_driver!(enable_downloads: false) do |driver|
87+
expect {
88+
driver.downloadable_files
89+
}.to raise_exception(Error::WebDriverError,
90+
'You must enable downloads in order to work with downloadable files.')
91+
end
9092
end
9193

9294
private

rust/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ rust_binary(
7777
name = "selenium-manager",
7878
srcs = ["src/main.rs"],
7979
edition = "2021",
80-
version = "0.4.24",
80+
version = "0.4.26",
8181
visibility = ["//visibility:public"],
8282
deps = [
8383
":selenium_manager",

rust/Cargo.Bazel.lock

Lines changed: 90 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "1b307b787c95f27b60af367955d57dfd4b21ff233bf6e156a87950f4c610430e",
2+
"checksum": "25815f2fbf7f42d91f8978faaf1b1d727eddc9e14d9440b791c2048e431b3743",
33
"crates": {
44
"addr2line 0.21.0": {
55
"name": "addr2line",
@@ -572,14 +572,14 @@
572572
],
573573
"license_file": "LICENSE-APACHE"
574574
},
575-
"anyhow 1.0.89": {
575+
"anyhow 1.0.91": {
576576
"name": "anyhow",
577-
"version": "1.0.89",
577+
"version": "1.0.91",
578578
"package_url": "https://github.com/dtolnay/anyhow",
579579
"repository": {
580580
"Http": {
581-
"url": "https://static.crates.io/crates/anyhow/1.0.89/download",
582-
"sha256": "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
581+
"url": "https://static.crates.io/crates/anyhow/1.0.91/download",
582+
"sha256": "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
583583
}
584584
},
585585
"targets": [
@@ -623,7 +623,7 @@
623623
"deps": {
624624
"common": [
625625
{
626-
"id": "anyhow 1.0.89",
626+
"id": "anyhow 1.0.91",
627627
"target": "build_script_build"
628628
},
629629
{
@@ -634,7 +634,7 @@
634634
"selects": {}
635635
},
636636
"edition": "2018",
637-
"version": "1.0.89"
637+
"version": "1.0.91"
638638
},
639639
"build_script_attrs": {
640640
"compile_data_glob": [
@@ -2034,16 +2034,79 @@
20342034
"id": "jobserver 0.1.31",
20352035
"target": "jobserver"
20362036
},
2037-
{
2038-
"id": "libc 0.2.160",
2039-
"target": "libc"
2040-
},
20412037
{
20422038
"id": "shlex 1.3.0",
20432039
"target": "shlex"
20442040
}
20452041
],
2046-
"selects": {}
2042+
"selects": {
2043+
"aarch64-apple-darwin": [
2044+
{
2045+
"id": "libc 0.2.160",
2046+
"target": "libc"
2047+
}
2048+
],
2049+
"aarch64-unknown-linux-gnu": [
2050+
{
2051+
"id": "libc 0.2.160",
2052+
"target": "libc"
2053+
}
2054+
],
2055+
"aarch64-unknown-nixos-gnu": [
2056+
{
2057+
"id": "libc 0.2.160",
2058+
"target": "libc"
2059+
}
2060+
],
2061+
"arm-unknown-linux-gnueabi": [
2062+
{
2063+
"id": "libc 0.2.160",
2064+
"target": "libc"
2065+
}
2066+
],
2067+
"i686-unknown-linux-gnu": [
2068+
{
2069+
"id": "libc 0.2.160",
2070+
"target": "libc"
2071+
}
2072+
],
2073+
"powerpc-unknown-linux-gnu": [
2074+
{
2075+
"id": "libc 0.2.160",
2076+
"target": "libc"
2077+
}
2078+
],
2079+
"s390x-unknown-linux-gnu": [
2080+
{
2081+
"id": "libc 0.2.160",
2082+
"target": "libc"
2083+
}
2084+
],
2085+
"x86_64-apple-darwin": [
2086+
{
2087+
"id": "libc 0.2.160",
2088+
"target": "libc"
2089+
}
2090+
],
2091+
"x86_64-unknown-freebsd": [
2092+
{
2093+
"id": "libc 0.2.160",
2094+
"target": "libc"
2095+
}
2096+
],
2097+
"x86_64-unknown-linux-gnu": [
2098+
{
2099+
"id": "libc 0.2.160",
2100+
"target": "libc"
2101+
}
2102+
],
2103+
"x86_64-unknown-nixos-gnu": [
2104+
{
2105+
"id": "libc 0.2.160",
2106+
"target": "libc"
2107+
}
2108+
]
2109+
}
20472110
},
20482111
"edition": "2018",
20492112
"version": "1.1.30"
@@ -4058,7 +4121,7 @@
40584121
"target": "log"
40594122
},
40604123
{
4061-
"id": "regex 1.11.0",
4124+
"id": "regex 1.11.1",
40624125
"target": "regex"
40634126
}
40644127
],
@@ -10411,14 +10474,14 @@
1041110474
],
1041210475
"license_file": "LICENSE"
1041310476
},
10414-
"regex 1.11.0": {
10477+
"regex 1.11.1": {
1041510478
"name": "regex",
10416-
"version": "1.11.0",
10479+
"version": "1.11.1",
1041710480
"package_url": "https://github.com/rust-lang/regex",
1041810481
"repository": {
1041910482
"Http": {
10420-
"url": "https://static.crates.io/crates/regex/1.11.0/download",
10421-
"sha256": "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
10483+
"url": "https://static.crates.io/crates/regex/1.11.1/download",
10484+
"sha256": "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
1042210485
}
1042310486
},
1042410487
"targets": [
@@ -10484,7 +10547,7 @@
1048410547
"selects": {}
1048510548
},
1048610549
"edition": "2021",
10487-
"version": "1.11.0"
10550+
"version": "1.11.1"
1048810551
},
1048910552
"license": "MIT OR Apache-2.0",
1049010553
"license_ids": [
@@ -12808,7 +12871,7 @@
1280812871
"target": "quote"
1280912872
},
1281012873
{
12811-
"id": "regex 1.11.0",
12874+
"id": "regex 1.11.1",
1281212875
"target": "regex"
1281312876
},
1281412877
{
@@ -14046,9 +14109,9 @@
1404614109
],
1404714110
"license_file": "LICENSE"
1404814111
},
14049-
"selenium-manager 0.4.24": {
14112+
"selenium-manager 0.4.26": {
1405014113
"name": "selenium-manager",
14051-
"version": "0.4.24",
14114+
"version": "0.4.26",
1405214115
"package_url": "https://github.com/SeleniumHQ/selenium",
1405314116
"repository": null,
1405414117
"targets": [
@@ -14073,7 +14136,7 @@
1407314136
"deps": {
1407414137
"common": [
1407514138
{
14076-
"id": "anyhow 1.0.89",
14139+
"id": "anyhow 1.0.91",
1407714140
"target": "anyhow"
1407814141
},
1407914142
{
@@ -14117,7 +14180,7 @@
1411714180
"target": "log"
1411814181
},
1411914182
{
14120-
"id": "regex 1.11.0",
14183+
"id": "regex 1.11.1",
1412114184
"target": "regex"
1412214185
},
1412314186
{
@@ -14185,7 +14248,7 @@
1418514248
"selects": {}
1418614249
},
1418714250
"edition": "2021",
14188-
"version": "0.4.24"
14251+
"version": "0.4.26"
1418914252
},
1419014253
"license": "Apache-2.0",
1419114254
"license_ids": [
@@ -22151,7 +22214,7 @@
2215122214
},
2215222215
"binary_crates": [],
2215322216
"workspace_members": {
22154-
"selenium-manager 0.4.24": "rust"
22217+
"selenium-manager 0.4.26": "rust"
2215522218
},
2215622219
"conditions": {
2215722220
"aarch64-apple-darwin": [
@@ -22673,7 +22736,7 @@
2267322736
]
2267422737
},
2267522738
"direct_deps": [
22676-
"anyhow 1.0.89",
22739+
"anyhow 1.0.91",
2267722740
"apple-flat-package 0.18.0",
2267822741
"bzip2 0.4.4",
2267922742
"clap 4.5.20",
@@ -22684,7 +22747,7 @@
2268422747
"flate2 1.0.34",
2268522748
"infer 0.16.0",
2268622749
"log 0.4.22",
22687-
"regex 1.11.0",
22750+
"regex 1.11.1",
2268822751
"reqwest 0.12.8",
2268922752
"serde 1.0.210",
2269022753
"serde_json 1.0.128",

rust/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "selenium-manager"
3-
version = "0.4.24" # don't forget to update rust/BUILD.bazel
3+
version = "0.4.26" # don't forget to update rust/BUILD.bazel
44
edition = "2021"
55
authors = ["Selenium <selenium-developers@googlegroups.com"]
66
license = "Apache-2.0"

0 commit comments

Comments
 (0)