Skip to content

Commit 36b08cd

Browse files
committed
Merge branch 'fix-python-type-annotations' of https://github.com/Paresh-0007/selenium into fix-python-type-annotations
2 parents 65f4700 + b14629e commit 36b08cd

File tree

91 files changed

+1050
-499
lines changed

Some content is hidden

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

91 files changed

+1050
-499
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

CONTRIBUTING.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@ the defect. If the issue can't be reproduced it will be closed.
1414
Please provide [concise reproducible test cases](http://sscce.org/)
1515
and describe what results you are seeing and what results you expect.
1616

17-
Issues shouldn't be used for support. Please address questions to the
18-
[`selenium-users@` mailing list](https://groups.google.com/forum/#!forum/selenium-users).
17+
Issues shouldn't be used for support. To raise a bug, please go to the
18+
[Issue tracker](https://github.com/SeleniumHQ/selenium/issues).
1919
Discussion of high level project ideas or non-technical topics should
20-
move to the
21-
[`selenium-developers@` mailing list](https://groups.google.com/forum/#!forum/selenium-developers)
22-
instead.
20+
move to the Selenium [Slack channel](https://inviter.co/seleniumhq).
2321

2422
We also need help with triaging
2523
[issues that needs investigation](https://github.com/SeleniumHQ/selenium/labels/I-needs%20investigation).
@@ -34,7 +32,6 @@ with details describing what feature(s) you'd like added or changed.
3432

3533
If you'd like a hand at trying to implement the feature yourself, please refer to the [Code Contributions](#code-contributions) section of the document.
3634

37-
3835
## Documentation
3936

4037
Selenium is a big software project and documentation is key to

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/extensions/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ filegroup(
77
"**/*",
88
]),
99
visibility = [
10+
"//dotnet/test/common:__pkg__",
1011
"//java/test/org/openqa/selenium/chrome:__pkg__",
1112
"//java/test/org/openqa/selenium/edge:__pkg__",
1213
"//java/test/org/openqa/selenium/environment:__pkg__",

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: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -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/2c91478b-aace-43d7-8329-0bc57341712f/MicrosoftEdge-139.0.3405.86.pkg",
127-
sha256 = "07051b3d4c97eeeff72c0858ae9510a249d9b1193a9c0174bef4a9697dbd395d",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/4d599f34-3ef7-4f04-bd4b-6f35be25008c/MicrosoftEdge-139.0.3405.102.pkg",
127+
sha256 = "c5edb687ac110cabedf989706a6e9fade4f30375ef194f155fade830fc8837be",
128128
move = {
129-
"MicrosoftEdge-139.0.3405.86.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-139.0.3405.102.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_139.0.3405.86-1_amd64.deb",
147-
sha256 = "4b5fd1512c1142c0509e8fc8df5c63c35086b34b49a65e4745ab5ab7ec0eaa61",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_139.0.3405.102-1_amd64.deb",
147+
sha256 = "ad8e90dec3080065ff64a395bf04a5e9cc6adb8481d4f8829fb6f5a4c5cc7a9b",
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.microsoft.com/139.0.3405.86/edgedriver_linux64.zip",
169-
sha256 = "49ce29de50f9ac418a3a2416708a5563215b8412b27d3e505f3c859fc6ffba12",
168+
url = "https://msedgedriver.microsoft.com/139.0.3405.102/edgedriver_linux64.zip",
169+
sha256 = "e092178901c011ccfddc0556193742a01f206d71b5bb1a12cc1ba7a243262fc2",
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.microsoft.com/139.0.3405.86/edgedriver_mac64.zip",
186-
sha256 = "b6c8244dfb7b8a223d3ac8fd569533f0a307eadaca2b8cbc884ce7f69294682e",
185+
url = "https://msedgedriver.microsoft.com/139.0.3405.102/edgedriver_mac64.zip",
186+
sha256 = "98aa637081061ea610c1f70be09fdea6b5f5b3a46c94a87ca291e2285bad1328",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])
@@ -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/BiDi.cs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public sealed class BiDi : IAsyncDisposable
3636
private Script.ScriptModule? _scriptModule;
3737
private Log.LogModule? _logModule;
3838
private Storage.StorageModule? _storageModule;
39+
private WebExtension.WebExtensionModule? _webExtensionModule;
3940

4041
private readonly object _moduleLock = new();
4142

@@ -150,12 +151,25 @@ public Storage.StorageModule Storage
150151
}
151152
}
152153

154+
public WebExtension.WebExtensionModule WebExtension
155+
{
156+
get
157+
{
158+
if (_webExtensionModule is not null) return _webExtensionModule;
159+
lock (_moduleLock)
160+
{
161+
_webExtensionModule ??= new WebExtension.WebExtensionModule(_broker);
162+
}
163+
return _webExtensionModule;
164+
}
165+
}
166+
153167
public Task<Session.StatusResult> StatusAsync()
154168
{
155169
return SessionModule.StatusAsync();
156170
}
157171

158-
public static async Task<BiDi> ConnectAsync(string url)
172+
public static async Task<BiDi> ConnectAsync(string url, BiDiOptions? options = null)
159173
{
160174
var bidi = new BiDi(url);
161175

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
}

0 commit comments

Comments
 (0)