Skip to content

Commit 0403982

Browse files
authored
Merge branch 'trunk' into rbe_eif
2 parents 2468473 + 3079db6 commit 0403982

File tree

24 files changed

+125
-124
lines changed

24 files changed

+125
-124
lines changed

.github/label-commenter-config.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Configuration for Label Commenter - https://github.com/peaceiris/actions-label-commenter
22
labels:
3-
- name: needs-triaging
3+
- name: A-needs-triaging
44
labeled:
55
issue:
66
body: |
@@ -15,7 +15,7 @@ labels:
1515
Triage this issue by using labels.
1616
</p>
1717
<p>
18-
If information is missing, add a helpful comment and then <code>I-issue-template</code> label.
18+
If information is missing, add a helpful comment and then <code>J-issue-template</code> label.
1919
</p>
2020
<p>
2121
If the issue is a question, add the <code>I-question</code> label.
@@ -101,18 +101,18 @@ labels:
101101
102102
Feel free to comment the issues that you raise back in this issue. Thank you.
103103
action: close
104-
- name: I-issue-template
104+
- name: J-issue-template
105105
labeled:
106106
issue:
107107
body: |
108108
Hi, @{{ issue.user.login }}.
109-
Please follow the issue template, we need more information to reproduce the issue.
109+
Please follow the issue template; we need more information to reproduce the issue.
110110
111111
Either a complete code snippet and URL/HTML (if more than one file is needed, provide a GitHub repo and instructions to run the code), the specific versions used, or a more detailed description to help us understand the issue.
112112
113113
Note: If you cannot share your code and URL/HTML, any complete code snippet and URL/HTML that reproduces the issue is good enough.
114114
115-
Reply to this issue when all information is provided, thank you.
115+
Reply to this issue when all information is provided. Thank you.
116116
- name: I-question
117117
labeled:
118118
issue:
@@ -137,3 +137,17 @@ labels:
137137
138138
Please turn on logging and re-run your code. Information on how to adjust logs for your language can be found in our
139139
[Troubleshooting documentation](https://www.selenium.dev/documentation/webdriver/troubleshooting/logging/).
140+
- name: B-support
141+
labeled:
142+
issue:
143+
body: |
144+
Hi, @{{ issue.user.login }}.
145+
146+
This is related to code in the Support packages. The support packages contain example code that
147+
many users find helpful, but they do not necessarily represent the best practices for using Selenium,
148+
and the Selenium team is not prioritizing work on them right now.
149+
This doesn't mean that we won't ever work on them, but it is not on our roadmap as we push to release Selenium 5.
150+
151+
We actively encourage people to create their own wrapper and helper code that makes sense for them.
152+
If you have any questions, please [contact us](https://www.selenium.dev/support)
153+

.github/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
changelog:
22
exclude:
33
labels:
4-
- dependencies
4+
- B-dependencies
55
authors:
66
- selenium-ci

.github/renovate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"labels": ["B-dependencies"]
3+
}

.github/workflows/bazel.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ jobs:
139139
uses: bazel-contrib/[email protected]
140140
with:
141141
bazelrc: common --color=yes
142+
- name: Setup curl for Ubuntu
143+
if: inputs.os == 'ubuntu'
144+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
142145
- name: Setup Fluxbox and Xvfb
143146
if: inputs.os == 'ubuntu' && inputs.browser != ''
144147
run: |
@@ -152,9 +155,6 @@ jobs:
152155
- name: Setup Safari
153156
if: inputs.browser == 'safari'
154157
run: sudo safaridriver --enable
155-
- name: Setup curl for Ubuntu
156-
if: inputs.os == 'ubuntu'
157-
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
158158
- name: Run Bazel
159159
run: ${{ inputs.run }}
160160
- name: Start SSH session

.github/workflows/stale.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,29 @@ jobs:
2020
with:
2121
stale-issue-message: 'This issue is stale because it has been open 280 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
2222
close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
23-
stale-issue-label: 'I-stale'
23+
stale-issue-label: 'J-stale'
24+
stale-pr-label: 'J-stale'
2425
days-before-stale: 180
2526
days-before-close: 14
2627
exempt-all-milestones: true
2728
- uses: actions/stale@v9
2829
with:
2930
close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
30-
stale-issue-label: 'R-awaiting answer'
31+
stale-issue-label: 'J-awaiting answer'
3132
days-before-stale: -1
3233
days-before-close: 14
33-
labels-to-add-when-unstale: 'needs-triaging'
34-
34+
labels-to-add-when-unstale: 'A-needs-triaging'
35+
- uses: actions/stale@v9
36+
with:
37+
close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
38+
stale-issue-label: 'J-logging'
39+
days-before-stale: -1
40+
days-before-close: 14
41+
labels-to-add-when-unstale: 'A-needs-triaging'
42+
- uses: actions/stale@v9
43+
with:
44+
close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
45+
stale-issue-label: 'J-issue-template'
46+
days-before-stale: -1
47+
days-before-close: 14
48+
labels-to-add-when-unstale: 'A-needs-triaging'

.github/workflows/update-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,5 @@ jobs:
107107
- Auto-generated by [create-pull-request][1]
108108
109109
[1]: https://github.com/peter-evans/create-pull-request
110-
labels: documentation
110+
labels: B-docs
111111
draft: false

Rakefile

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -509,19 +509,21 @@ namespace :node do
509509
task deploy: :release
510510

511511
desc 'Generate Node documentation'
512-
task :docs, [:skip_update] do |_task, arguments|
512+
task :docs do |_task, arguments|
513513
abort('Aborting documentation update: nightly versions should not update docs.') if node_version.include?('nightly')
514514

515515
puts 'Generating Node documentation'
516516
FileUtils.rm_rf('build/docs/api/javascript/')
517517
begin
518-
sh 'npm install --prefix javascript/selenium-webdriver', verbose: true
519-
sh 'npm run generate-docs --prefix javascript/selenium-webdriver', verbose: true
518+
Dir.chdir('javascript/selenium-webdriver') do
519+
sh 'pnpm install', verbose: true
520+
sh 'pnpm run generate-docs', verbose: true
521+
end
520522
rescue StandardError => e
521523
puts "Node documentation generation contains errors; continuing... #{e.message}"
522524
end
523525

524-
update_gh_pages unless arguments[:skip_update]
526+
update_gh_pages unless arguments.to_a.include?('skip_update')
525527
end
526528

527529
desc 'Update JavaScript changelog'
@@ -544,9 +546,7 @@ namespace :node do
544546
end
545547

546548
# Update package-lock.json
547-
Dir.chdir('javascript/selenium-webdriver') do
548-
sh 'npm install --prefix javascript/selenium-webdriver', verbose: true
549-
end
549+
sh 'pnpm install --dir javascript/selenium-webdriver', verbose: true
550550
@git.add('javascript/selenium-webdriver/package-lock.json')
551551
end
552552
end
@@ -611,7 +611,7 @@ namespace :py do
611611
end
612612

613613
desc 'Generate Python documentation'
614-
task :docs, [:skip_update] do |_task, arguments|
614+
task :docs do |_task, arguments|
615615
if python_version.match?(/^\d+\.\d+\.\d+\.\d+$/)
616616
abort('Aborting documentation update: nightly versions should not update docs.')
617617
end
@@ -626,7 +626,7 @@ namespace :py do
626626
raise
627627
end
628628

629-
update_gh_pages unless arguments[:skip_update]
629+
update_gh_pages unless arguments.to_a.include?('skip_update')
630630
end
631631

632632
desc 'Install Python wheel locally'
@@ -779,7 +779,7 @@ namespace :rb do
779779
end
780780

781781
desc 'Generate Ruby documentation'
782-
task :docs, [:skip_update] do |_task, arguments|
782+
task :docs do |_task, arguments|
783783
abort('Aborting documentation update: nightly versions should not update docs.') if ruby_version.include?('nightly')
784784
puts 'Generating Ruby documentation'
785785

@@ -788,7 +788,7 @@ namespace :rb do
788788
FileUtils.mkdir_p('build/docs/api')
789789
FileUtils.cp_r('bazel-bin/rb/docs.sh.runfiles/_main/docs/api/rb/.', 'build/docs/api/rb')
790790

791-
update_gh_pages unless arguments[:skip_update]
791+
update_gh_pages unless arguments.to_a.include?('skip_update')
792792
end
793793

794794
desc 'Update Ruby changelog'
@@ -875,7 +875,7 @@ namespace :dotnet do
875875
end
876876

877877
desc 'Generate .NET documentation'
878-
task :docs, [:skip_update] do |_task, arguments|
878+
task :docs do |_task, arguments|
879879
if dotnet_version.include?('nightly')
880880
abort('Aborting documentation update: nightly versions should not update docs.')
881881
end
@@ -905,7 +905,7 @@ namespace :dotnet do
905905
end
906906
end
907907

908-
update_gh_pages unless arguments[:skip_update]
908+
update_gh_pages unless arguments.to_a.include?('skip_update')
909909
end
910910

911911
desc 'Update .NET changelog'
@@ -990,15 +990,15 @@ namespace :java do
990990
task install: :'maven-install'
991991

992992
desc 'Generate Java documentation'
993-
task :docs, [:skip_update] do |_task, arguments|
993+
task :docs do |_task, arguments|
994994
if java_version.include?('SNAPSHOT')
995995
abort('Aborting documentation update: snapshot versions should not update docs.')
996996
end
997997

998998
puts 'Generating Java documentation'
999999
Rake::Task['javadocs'].invoke
10001000

1001-
update_gh_pages unless arguments[:skip_update]
1001+
update_gh_pages unless arguments.to_a.include?('skip_update')
10021002
end
10031003

10041004
desc 'Update Maven dependencies'
@@ -1248,8 +1248,8 @@ def update_gh_pages(force: true)
12481248
@git.fetch('https://github.com/seleniumhq/selenium.git', {ref: 'gh-pages'})
12491249

12501250
unless force
1251-
puts 'Stashing current changes before checkout...'
1252-
Git::Stash.new(@git, 'stash wip')
1251+
puts 'Stash changes that are not docs...'
1252+
@git.lib.send(:command, 'stash', ['push', '-m', 'stash wip', '--', ':(exclude)build/docs/api/'])
12531253
end
12541254

12551255
@git.checkout('gh-pages', force: force)

common/repositories.bzl

Lines changed: 17 additions & 17 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/136.0.4/linux-x86_64/en-US/firefox-136.0.4.tar.xz",
15+
sha256 = "ffebf056b2d6cb477ed5768b899d84b6ba553787ca9465cd5783f5e3ebbe75d7",
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/136.0.4/mac/en-US/Firefox%20136.0.4.dmg",
37+
sha256 = "c1cb0a0b2ec2c733e77529a5f87a7ed834551712c1b91aa2ab06f9f921eb154f",
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/137.0b10/linux-x86_64/en-US/firefox-137.0b10.tar.xz",
54+
sha256 = "319af71913886726333110cc2f365b39cdaa120d90938869985f8967e8f4f4af",
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/137.0b10/mac/en-US/Firefox%20137.0b10.dmg",
76+
sha256 = "93de7f00a296d0027295020bb8c6378fa1a95015bc78ec0bb3ffd60d264ccb0e",
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"])

dotnet/src/webdriver/Alert.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public string? Text
4545
{
4646
get
4747
{
48-
Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAlertText, null);
48+
Response commandResponse = this.driver.Execute(DriverCommand.GetAlertText, null);
4949
return (string?)commandResponse.Value;
5050
}
5151
}
@@ -55,15 +55,15 @@ public string? Text
5555
/// </summary>
5656
public void Dismiss()
5757
{
58-
this.driver.InternalExecute(DriverCommand.DismissAlert, null);
58+
this.driver.Execute(DriverCommand.DismissAlert, null);
5959
}
6060

6161
/// <summary>
6262
/// Accepts the alert.
6363
/// </summary>
6464
public void Accept()
6565
{
66-
this.driver.InternalExecute(DriverCommand.AcceptAlert, null);
66+
this.driver.Execute(DriverCommand.AcceptAlert, null);
6767
}
6868

6969
/// <summary>
@@ -81,7 +81,7 @@ public void SendKeys(string keysToSend)
8181
Dictionary<string, object> parameters = new Dictionary<string, object>();
8282
parameters.Add("text", keysToSend);
8383

84-
this.driver.InternalExecute(DriverCommand.SetAlertValue, parameters);
84+
this.driver.Execute(DriverCommand.SetAlertValue, parameters);
8585
}
8686
}
8787
}

0 commit comments

Comments
 (0)