Skip to content

Commit 513eda4

Browse files
nvborisenkonvborisenko
committed
Merge remote-tracking branch 'upstream/trunk' into bidi-webextension
2 parents ba6bcf7 + ae953fc commit 513eda4

File tree

68 files changed

+548
-466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+548
-466
lines changed

‎.github/workflows/stage-release.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,5 @@ jobs:
8181
with:
8282
version: ${{ needs.github-release.outputs.version }}
8383
sha: ${{ github.sha }}
84+
secrets:
85+
SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

‎.github/workflows/update-documentation.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ on:
1919
- dotnet
2020
- node
2121
- all
22+
force:
23+
description: Force generation even if version is nightly, type "force" to enable
24+
required: false
25+
type: string
26+
default: ""
2227

2328
workflow_call:
2429
inputs:
@@ -32,6 +37,9 @@ on:
3237
required: false
3338
type: string
3439
default: "all"
40+
secrets:
41+
SELENIUM_CI_TOKEN:
42+
required: true
3543

3644
env:
3745
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -74,7 +82,7 @@ jobs:
7482
npm install
7583
npm install --prefix javascript/selenium-webdriver
7684
- name: Generate Documentation for selected langauges
77-
run: ./go ${{ inputs.language }}:docs
85+
run: ./go ${{ inputs.language }}:docs ${{ inputs.force }}
7886
- name: Documentation Pull Request
7987
id: cpr
8088
uses: peter-evans/create-pull-request@v6

‎Rakefile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,12 +1118,13 @@ namespace :all do
11181118
end
11191119

11201120
desc 'Update all API Documentation'
1121-
task :docs do
1122-
Rake::Task['java:docs'].invoke('skip_update')
1123-
Rake::Task['py:docs'].invoke('skip_update')
1124-
Rake::Task['rb:docs'].invoke('skip_update')
1125-
Rake::Task['dotnet:docs'].invoke('skip_update')
1126-
Rake::Task['node:docs'].invoke('skip_update')
1121+
task :docs do |_task, arguments|
1122+
args = arguments.to_a
1123+
Rake::Task['java:docs'].invoke(*(args + ['skip_update']))
1124+
Rake::Task['py:docs'].invoke(*(args + ['skip_update']))
1125+
Rake::Task['rb:docs'].invoke(*(args + ['skip_update']))
1126+
Rake::Task['dotnet:docs'].invoke(*(args + ['skip_update']))
1127+
Rake::Task['node:docs'].invoke(*(args + ['skip_update']))
11271128

11281129
update_gh_pages
11291130
end

‎common/mirror/selenium‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
[
22
{
3-
"tag_name": "selenium-4.35.0",
3+
"tag_name": "nightly",
44
"assets": [
55
{
6-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-dotnet-4.35.0.zip"
7-
},
8-
{
9-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-dotnet-strongnamed-4.35.0.zip"
10-
},
11-
{
12-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-java-4.35.0.zip"
6+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.36.0-SNAPSHOT.zip"
137
},
148
{
15-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-server-4.35.0.jar"
9+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.36.0-SNAPSHOT.jar"
1610
},
1711
{
18-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-server-4.35.0.zip"
12+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.36.0-SNAPSHOT.zip"
1913
}
2014
]
2115
},
2216
{
23-
"tag_name": "nightly",
17+
"tag_name": "selenium-4.35.0",
2418
"assets": [
2519
{
26-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.36.0-SNAPSHOT.zip"
20+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-dotnet-4.35.0.zip"
2721
},
2822
{
29-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.36.0-SNAPSHOT.jar"
23+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-dotnet-strongnamed-4.35.0.zip"
3024
},
3125
{
32-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.36.0-SNAPSHOT.zip"
26+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-java-4.35.0.zip"
27+
},
28+
{
29+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-server-4.35.0.jar"
30+
},
31+
{
32+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-server-4.35.0.zip"
3333
}
3434
]
3535
},

‎common/repositories.bzl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ js_library(
277277

278278
http_archive(
279279
name = "linux_beta_chrome",
280-
url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.6/linux64/chrome-linux64.zip",
281-
sha256 = "b157ec8a2952606724486f9ed0911aa4dec8e3bcbeb1ba722c13f52999a58dff",
280+
url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.16/linux64/chrome-linux64.zip",
281+
sha256 = "ced1841af7400a153e23cef3e39a7f9247034a0f1ce845b36b22904920db63e2",
282282
build_file_content = """
283283
load("@aspect_rules_js//js:defs.bzl", "js_library")
284284
package(default_visibility = ["//visibility:public"])
@@ -298,8 +298,8 @@ js_library(
298298
)
299299
http_archive(
300300
name = "mac_beta_chrome",
301-
url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.6/mac-x64/chrome-mac-x64.zip",
302-
sha256 = "6d5b57ee94e218a4101662e02d0f8086e4711701be7d99a2693ad62809f927fe",
301+
url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.16/mac-x64/chrome-mac-x64.zip",
302+
sha256 = "dcc3d96ad192f15f10089b7a92fb429ba0a934f4820eecc3af44f0d961b4bcf5",
303303
strip_prefix = "chrome-mac-x64",
304304
patch_cmds = [
305305
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -319,8 +319,8 @@ js_library(
319319
)
320320
http_archive(
321321
name = "linux_beta_chromedriver",
322-
url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.6/linux64/chromedriver-linux64.zip",
323-
sha256 = "78c84b8bb6f7671a657ecf25531fa7972c9d4ea753523e11d2f75a0eb14ebff0",
322+
url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.16/linux64/chromedriver-linux64.zip",
323+
sha256 = "f40639ecc590adea9583a15066afd8e2e3e84173435dc4e31d9b01afcc41bd66",
324324
strip_prefix = "chromedriver-linux64",
325325
build_file_content = """
326326
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -337,8 +337,8 @@ js_library(
337337

338338
http_archive(
339339
name = "mac_beta_chromedriver",
340-
url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.6/mac-x64/chromedriver-mac-x64.zip",
341-
sha256 = "10dc8f0ea0154261aedb2f1b075bee761f1a26de793085d4f22160cc169e22d4",
340+
url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.16/mac-x64/chromedriver-mac-x64.zip",
341+
sha256 = "931126b95bdaed2ae63001195c8506011d6e7d2554b61462c82e19671602978b",
342342
strip_prefix = "chromedriver-mac-x64",
343343
build_file_content = """
344344
load("@aspect_rules_js//js:defs.bzl", "js_library")

‎common/selenium_manager.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def selenium_manager():
2020
http_file(
2121
name = "download_sm_windows",
2222
executable = True,
23-
sha256 = "eb6e3b19bb70c3fee7fdb332153d7c7c523034044059900e80b663b8817e720c",
23+
sha256 = "89dd1d25e321a07cc88fd76fb6143008298092faecb1573835e0f86483d0abfa",
2424
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-acecd4f/selenium-manager-windows.exe",
2525
)
2626

‎dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public async Task<EmptyResult> CloseAsync(CloseOptions? options = null)
3131

3232
public async Task<UserContextInfo> CreateUserContextAsync(CreateUserContextOptions? options = null)
3333
{
34-
var @params = new CreateUserContextCommandParameters(options?.AcceptInsecureCerts, options?.Proxy, options?.UnhandledPromptBehavior);
34+
var @params = new CreateUserContextParameters(options?.AcceptInsecureCerts, options?.Proxy, options?.UnhandledPromptBehavior);
3535

3636
return await Broker.ExecuteCommandAsync<CreateUserContextCommand, UserContextInfo>(new CreateUserContextCommand(@params), options).ConfigureAwait(false);
3737
}
@@ -43,7 +43,7 @@ public async Task<GetUserContextsResult> GetUserContextsAsync(GetUserContextsOpt
4343

4444
public async Task<EmptyResult> RemoveUserContextAsync(UserContext userContext, RemoveUserContextOptions? options = null)
4545
{
46-
var @params = new RemoveUserContextCommandParameters(userContext);
46+
var @params = new RemoveUserContextParameters(userContext);
4747

4848
return await Broker.ExecuteCommandAsync<RemoveUserContextCommand, EmptyResult>(new RemoveUserContextCommand(@params), options).ConfigureAwait(false);
4949
}

‎dotnet/src/webdriver/BiDi/Browser/CloseCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
namespace OpenQA.Selenium.BiDi.Browser;
2323

2424
internal sealed class CloseCommand()
25-
: Command<CommandParameters, EmptyResult>(CommandParameters.Empty, "browser.close");
25+
: Command<Parameters, EmptyResult>(Parameters.Empty, "browser.close");
2626

2727
public sealed class CloseOptions : CommandOptions;

‎dotnet/src/webdriver/BiDi/Browser/CreateUserContextCommand.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
namespace OpenQA.Selenium.BiDi.Browser;
2323

24-
internal sealed class CreateUserContextCommand(CreateUserContextCommandParameters @params)
25-
: Command<CreateUserContextCommandParameters, UserContextInfo>(@params, "browser.createUserContext");
24+
internal sealed class CreateUserContextCommand(CreateUserContextParameters @params)
25+
: Command<CreateUserContextParameters, UserContextInfo>(@params, "browser.createUserContext");
2626

27-
internal sealed record CreateUserContextCommandParameters(bool? AcceptInsecureCerts, Session.ProxyConfiguration? Proxy, Session.UserPromptHandler? UnhandledPromptBehavior) : CommandParameters;
27+
internal sealed record CreateUserContextParameters(bool? AcceptInsecureCerts, Session.ProxyConfiguration? Proxy, Session.UserPromptHandler? UnhandledPromptBehavior) : Parameters;
2828

2929
public sealed class CreateUserContextOptions : CommandOptions
3030
{

‎dotnet/src/webdriver/BiDi/Browser/GetClientWindowsCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
namespace OpenQA.Selenium.BiDi.Browser;
2525

2626
internal sealed class GetClientWindowsCommand()
27-
: Command<CommandParameters, GetClientWindowsResult>(CommandParameters.Empty, "browser.getClientWindows");
27+
: Command<Parameters, GetClientWindowsResult>(Parameters.Empty, "browser.getClientWindows");
2828

2929
public sealed class GetClientWindowsOptions : CommandOptions;
3030

0 commit comments

Comments
 (0)