Skip to content

Commit 1b07427

Browse files
authored
Merge branch 'trunk' into browser
2 parents fda2d0a + ffe8f02 commit 1b07427

File tree

71 files changed

+645
-180
lines changed

Some content is hidden

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

71 files changed

+645
-180
lines changed

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

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/repositories.bzl

Lines changed: 9 additions & 9 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"])

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
}

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

dotnet/src/webdriver/BiDi/Browser/GetUserContextsCommand.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 GetUserContextsCommand()
27-
: Command<CommandParameters, GetUserContextsResult>(CommandParameters.Empty, "browser.getUserContexts");
27+
: Command<Parameters, GetUserContextsResult>(Parameters.Empty, "browser.getUserContexts");
2828

2929
public class GetUserContextsOptions : CommandOptions;
3030

dotnet/src/webdriver/BiDi/Browser/RemoveUserContextCommand.cs

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

2222
namespace OpenQA.Selenium.BiDi.Browser;
2323

24-
internal sealed class RemoveUserContextCommand(RemoveUserContextCommandParameters @params)
25-
: Command<RemoveUserContextCommandParameters, EmptyResult>(@params, "browser.removeUserContext");
24+
internal sealed class RemoveUserContextCommand(RemoveUserContextParameters @params)
25+
: Command<RemoveUserContextParameters, EmptyResult>(@params, "browser.removeUserContext");
2626

27-
internal sealed record RemoveUserContextCommandParameters(UserContext UserContext) : CommandParameters;
27+
internal sealed record RemoveUserContextParameters(UserContext UserContext) : Parameters;
2828

2929
public sealed class RemoveUserContextOptions : CommandOptions;

0 commit comments

Comments
 (0)