Skip to content

Commit f587dca

Browse files
VietND96VietND96
authored
Merge branch 'trunk' into safari_cookie
2 parents 482f199 + 9f6c0fe commit f587dca

File tree

21 files changed

+615
-414
lines changed

21 files changed

+615
-414
lines changed

‎.github/label-commenter-config.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,16 @@ labels:
150150
151151
We actively encourage people to create their own wrapper and helper code that makes sense for them.
152152
If you have any questions, please [contact us](https://www.selenium.dev/support)
153+
pr:
154+
body: |
155+
Thank you, @{{ pull_request.user.login }} for this code suggestion.
156+
157+
The support packages contain example code that many users find helpful, but they do not necessarily represent
158+
the best practices for using Selenium, and the Selenium team is not currently merging changes to them.
159+
160+
We actively encourage people to add the wrapper and helper code that makes sense for them to their own frameworks.
161+
If you have any questions, please [contact us](https://www.selenium.dev/support)
162+
action: close
163+
164+
153165

‎.github/pr-labeler-config.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
C-java:
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- 'java/**'
5+
6+
C-py:
7+
- changed-files:
8+
- any-glob-to-any-file:
9+
- 'py/**'
10+
11+
C-dotnet:
12+
- changed-files:
13+
- any-glob-to-any-file:
14+
- 'dotnet/**'
15+
16+
C-rb:
17+
- changed-files:
18+
- any-glob-to-any-file:
19+
- 'rb/**'
20+
21+
C-nodejs:
22+
- changed-files:
23+
- any-glob-to-any-file:
24+
- 'javascript/selenium-webdriver/**'
25+
26+
C-cpp:
27+
- changed-files:
28+
- any-glob-to-any-file:
29+
- 'cpp/**'
30+
31+
C-rust:
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- 'rust/**'
35+
36+
B-atoms:
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- 'javascript/atoms/**'
40+
41+
B-grid:
42+
- changed-files:
43+
- any-glob-to-any-file:
44+
- 'java/src/org/openqa/selenium/grid/**'
45+
- 'javascript/grid-ui/**'
46+
47+
B-manager:
48+
- changed-files:
49+
- any-glob-to-any-file:
50+
- 'rust/**'
51+
52+
B-devtools:
53+
- changed-files:
54+
- any-glob-to-any-file:
55+
- 'common/devtools/**'
56+
- '**/devtools/**'
57+
- '**/bidi/**'
58+
59+
B-build:
60+
- changed-files:
61+
- any-glob-to-any-file:
62+
- '.github/**'
63+
- 'scripts/**'
64+
- 'rake_tasks/**'
65+
- 'Rakefile'
66+
- 'BUILD.bazel'
67+
- '**/*.bazel'
68+
- '**/*.bzl'
69+
- '.bazel*'
70+
71+
B-support:
72+
- changed-files:
73+
- any-glob-to-any-file:
74+
- '**/support/**'

‎.github/workflows/label-commenter.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ name: Label Commenter
44
on:
55
issues:
66
types: [ labeled ]
7+
pull_request_target:
8+
types: [labeled]
79

810
permissions:
911
contents: read

‎.github/workflows/pr-labeler.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Label pull requests based on file paths
2+
3+
on:
4+
pull_request:
5+
types: [opened]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
11+
jobs:
12+
label:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v4
17+
- uses: actions/labeler@v5
18+
with:
19+
repo-token: ${{ secrets.GITHUB_TOKEN }}
20+
configuration-path: .github/pr-labeler-config.yml

‎.pr-agent.toml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Used by qodo-merge-pro bot
2+
3+
[config]
4+
enable_labeler = true
5+
enable_custom_labels=true
6+
labels_mode = "custom_only"
7+
8+
[custom_labels."B-atoms"]
9+
description = "Related to one or more of the JavaScript atoms Selenium compiles and uses"
10+
11+
[custom_labels."B-build"]
12+
description = "Related to any build script execution, bazel implementation or CI integrations"
13+
14+
[custom_labels."B-devtools"]
15+
description = "Related to anything BiDi or Chrome DevTools"
16+
17+
[custom_labels."B-docs"]
18+
description = "Related to API documentation such as Javadoc or code-level docs. Not for website updates, examples, or general comments."
19+
20+
[custom_labels."B-grid"]
21+
description = "Everything grid, server related, possibly including remote webdriver execution"
22+
23+
[custom_labels."B-manager"]
24+
description = "Focused on something related to Selenium Manager and Driver Finding, whether in Rust or in the bindings"
25+
26+
[custom_labels."D-chrome"]
27+
description = "Specific to Chrome"
28+
29+
[custom_labels."D-firefox"]
30+
description = "Specific to Firefox"
31+
32+
[custom_labels."D-safari"]
33+
description = "Specific to Safari"
34+
35+
[custom_labels."D-IE"]
36+
description = "Specific to Internet Explorer"
37+
38+
[custom_labels."D-edge"]
39+
description = "Specific to Microsoft Edge"
40+
41+
[custom_labels."E-easy"]
42+
description = "An easy PR to review"
43+
44+
[custom_labels."E-less easy"]
45+
description = "A somewhat difficult PR to review"
46+
47+
[custom_labels."E-hard"]
48+
description = "A hard or complex PR to review"
49+
50+
[custom_labels."I-cleanup"]
51+
description = "Internal tidy-up only, not user-facing. Applies to typo fixes, syntax tweaks, comment formatting, or dead code removal. Should not be used for bug fixes or behavior changes."
52+
53+
[custom_labels."I-regression"]
54+
description = "Fixes something that used to work and no longer does"
55+
56+
[custom_labels."I-performance"]
57+
description = "Improves performance"
58+
59+
[custom_labels."I-security"]
60+
description = "Addresses a security vulnerability"
61+
62+
[custom_labels."OS-linux"]
63+
description = "Specific to Linux"
64+
65+
[custom_labels."OS-mac"]
66+
description = "Specific to macOS"
67+
68+
[custom_labels."OS-windows"]
69+
description = "Specific to Windows"
70+
71+
[custom_labels."P-bug fix"]
72+
description = "Addresses a known issue in a backwards compatible way"
73+
74+
[custom_labels."P-enhancement"]
75+
description = "Creates a new feature in a backwards compatible way"
76+
77+
[custom_labels."P-breaking change"]
78+
description = "Introduces a non-backwards compatible change (a fix or feature that would cause existing functionality to change)"

‎Rakefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -544,10 +544,6 @@ namespace :node do
544544
File.open(file, 'w') { |f| f.puts text }
545545
@git.add(file)
546546
end
547-
548-
# Update package-lock.json
549-
sh 'pnpm install --dir javascript/selenium-webdriver', verbose: true
550-
@git.add('javascript/selenium-webdriver/package-lock.json')
551547
end
552548
end
553549

‎common/repositories.bzl‎

Lines changed: 25 additions & 25 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/136.0.2/linux-x86_64/en-US/firefox-136.0.2.tar.xz",
15-
sha256 = "7ea3882e814669784f0960e4d6bb50a0ac88997a1d17fb125d0f411961ad763a",
14+
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/en-US/firefox-137.0.tar.xz",
15+
sha256 = "4d2d0a64a11f8aab7a1be583e1e4cddfaf2671967212b369a87489f3c11c3ac9",
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/136.0.2/mac/en-US/Firefox%20136.0.2.dmg",
37-
sha256 = "69a917a6cdfa7c5ac44d8df9c03329faf46cb8b4f969826f2b33c1fd4cb43f08",
36+
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0/mac/en-US/Firefox%20137.0.dmg",
37+
sha256 = "bd9bff96ae3701f9c4957675ff3990fcb8306cbb2f6554fb81ad2427b1ec8464",
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/137.0b9/linux-x86_64/en-US/firefox-137.0b9.tar.xz",
54-
sha256 = "c31ca582522327d3946d33e4bb610d340e8b80b82a8d94f1397abe1a2493c4b2",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/138.0b1/linux-x86_64/en-US/firefox-138.0b1.tar.xz",
54+
sha256 = "1a502b1deb0df5a9c80b3f3e9807c599d2416aaa5bf2628d4cfa1b01448e378a",
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/137.0b9/mac/en-US/Firefox%20137.0b9.dmg",
76-
sha256 = "55ac7aa4c6fff6c84cfef94850482f733a83a8f8a61167b76b3e0ef43a5f76ac",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/138.0b1/mac/en-US/Firefox%20138.0b1.dmg",
76+
sha256 = "ed7eb980a71333c1f3936510d85a45ca7d04289a05ba1e845e0335738a6489ae",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
123123

124124
pkg_archive(
125125
name = "mac_edge",
126-
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/48fbf911-c173-49ef-a3cd-44bea1f03e93/MicrosoftEdge-134.0.3124.83.pkg",
127-
sha256 = "9e32af222a441f8f0858dd87191b5163e9c6fa86e73243b69eea63db04cac169",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/7697fb1f-03b9-4c5b-a21a-db2973b936d9/MicrosoftEdge-134.0.3124.95.pkg",
127+
sha256 = "0384868c1c3d97d60ff5da6500e6b48a9a47cadf46a509a2c6598b6d916a6b91",
128128
move = {
129-
"MicrosoftEdge-134.0.3124.83.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-134.0.3124.95.pkg/Payload/Microsoft Edge.app": "Edge.app",
130130
},
131131
build_file_content = """
132132
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
143143

144144
deb_archive(
145145
name = "linux_edge",
146-
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_134.0.3124.83-1_amd64.deb",
147-
sha256 = "df95dffa59575a01065f1c35170305e6dca194d09c42538a7983fe4142bb5963",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_134.0.3124.95-1_amd64.deb",
147+
sha256 = "be04c997d06631d9b8030d450a921fab37e682c2ee63ad46fd14a403aea43e12",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.azureedge.net/134.0.3124.83/edgedriver_linux64.zip",
169-
sha256 = "e1b72b689773624f3a6ec0b08273453b2b230074224fcc1e80adc8ad04faca0b",
168+
url = "https://msedgedriver.azureedge.net/134.0.3124.95/edgedriver_linux64.zip",
169+
sha256 = "fe4806a8b359729fa59a1e827fd464a8b76a7060725a615dc52b1f6d1a9a4446",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
172172
package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.azureedge.net/134.0.3124.83/edgedriver_mac64.zip",
186-
sha256 = "9839de83ae375ad5dd136827b46cfa21b486265cf87b471a7abd2dc07812f79b",
185+
url = "https://msedgedriver.azureedge.net/134.0.3124.95/edgedriver_mac64.zip",
186+
sha256 = "ba2c2e4efd1239e03ab5690a34efd0f32fd6aa7d534715da5e84e270870ef8b9",
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/134.0.6998.165/linux64/chrome-linux64.zip",
203-
sha256 = "1d93094e9781d1b1deb634b4cbf21369e5fb91a374689037e7aa712445045b9d",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.42/linux64/chrome-linux64.zip",
203+
sha256 = "47349b3a8191a2db0572ff815a99117af7d226cf79ced863192143f263758249",
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/134.0.6998.165/mac-x64/chrome-mac-x64.zip",
225-
sha256 = "cf1a1bba1d82b790aac96b32a8647c00ba8281d194cb6c0c556beb5472e350bd",
224+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.42/mac-x64/chrome-mac-x64.zip",
225+
sha256 = "b1e0350c25bd05e6bfb2f63e72f601700b9f56d6fd7d32737e9e74d53566bb13",
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/134.0.6998.165/linux64/chromedriver-linux64.zip",
247-
sha256 = "f45902a1b61ae4e5741c468286677213c6376fd6543b0809b94a84e6f7fc17f8",
246+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.42/linux64/chromedriver-linux64.zip",
247+
sha256 = "f684e5e39adcba8b0d968c0131d0348f5edf1365bfb176ef7857e32c7d3ebdbf",
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/134.0.6998.165/mac-x64/chromedriver-mac-x64.zip",
265-
sha256 = "4e5ff9ecbe1586e4820784e532b25c33eec0304f7699919d59d2888a4f49b95c",
264+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.42/mac-x64/chromedriver-mac-x64.zip",
265+
sha256 = "dadf62fb94b9407db5e93ee7710ad4afb6b987f061d1b41847c478c78f744e2f",
266266
strip_prefix = "chromedriver-mac-x64",
267267
build_file_content = """
268268
load("@aspect_rules_js//js:defs.bzl", "js_library")

‎common/src/web/bidi/logEntryAdded.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<body>
44

5-
<h1>Long entry added events</h1>
5+
<h1>Log entry added events</h1>
66

77
<button id="consoleLog" onclick="helloWorld()">Click me for console logs</button>
88

‎common/src/web/logEntryAdded.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<body>
44

5-
<h1>Long entry added events</h1>
5+
<h1>Log entry added events</h1>
66

77
<button id="consoleLog" onclick="helloWorld()">Click me for console logs</button>
88

0 commit comments

Comments
 (0)