Skip to content

Commit 99003b0

Browse files
authored
Merge branch 'trunk' into edge_bidi_remote
2 parents 7b021bd + 9a53f27 commit 99003b0

File tree

24 files changed

+235
-76
lines changed

24 files changed

+235
-76
lines changed

MODULE.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ maven.install(
200200
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
201201
"io.opentelemetry:opentelemetry-sdk-testing",
202202
"io.opentelemetry:opentelemetry-sdk-trace",
203-
"io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
204203
"it.ozimov:embedded-redis:0.7.3",
205204
"net.bytebuddy:byte-buddy:1.15.11",
206205
"org.htmlunit:htmlunit-core-js:4.7.0",

common/repositories.bzl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -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.0b1/linux-x86_64/en-US/firefox-137.0b1.tar.xz",
54-
sha256 = "98848e14e857a3562c4a2cf6fbbf7966e4f256cf6e127df0b367ac23c6638676",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b2/linux-x86_64/en-US/firefox-137.0b2.tar.xz",
54+
sha256 = "cfacafd480c40e6e9756cd4e5128e82c690bc53aca9d9dbf7bcfc6f2cf437fd6",
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.0b1/mac/en-US/Firefox%20137.0b1.dmg",
76-
sha256 = "b6ff3f376bc25e8890ed34278fe5c0719349839a45c5ac340118ff983f3741a5",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b2/mac/en-US/Firefox%20137.0b2.dmg",
76+
sha256 = "2038c5a761974ee521943986f82fee551de32d2e8839c1102c4bca70c5953bbb",
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/b52c4eaa-a0a4-4e86-9643-ef8f23ab8ec9/MicrosoftEdge-133.0.3065.92.pkg",
127-
sha256 = "bfa719621205421945eca8891c7ef1901af753994f4522c3eb9354d6c18c23ed",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/bd7a7bb2-a585-4892-8cb1-74c91c53c943/MicrosoftEdge-134.0.3124.51.pkg",
127+
sha256 = "5aa1d2fd4e35a177e98cddaee8b3edeedf6e765aef5a09d3872de96d5760778c",
128128
move = {
129-
"MicrosoftEdge-133.0.3065.92.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-134.0.3124.51.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_133.0.3065.92-1_amd64.deb",
147-
sha256 = "3d8fd372bae2aa8b99791790a778700d81e33fbffe93e5bc40e18c08befdf62f",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_134.0.3124.51-1_amd64.deb",
147+
sha256 = "8bb0ba438b820599c8c9dd8b03e2b0b39fd6c4765aa33fd4c6037d02d642b6ea",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
package(default_visibility = ["//visibility:public"])

dotnet/src/webdriver/BiDi/Communication/Command.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
// under the License.
1818
// </copyright>
1919

20+
using System.Text.Json.Serialization;
21+
2022
namespace OpenQA.Selenium.BiDi.Communication;
2123

2224
public abstract class Command
@@ -26,14 +28,17 @@ protected Command(string method)
2628
Method = method;
2729
}
2830

31+
[JsonPropertyOrder(1)]
2932
public string Method { get; }
3033

34+
[JsonPropertyOrder(0)]
3135
public int Id { get; internal set; }
3236
}
3337

3438
internal abstract class Command<TCommandParameters>(TCommandParameters @params, string method) : Command(method)
3539
where TCommandParameters : CommandParameters
3640
{
41+
[JsonPropertyOrder(2)]
3742
public TCommandParameters Params { get; } = @params;
3843
}
3944

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
170170

171171
[JsonSerializable(typeof(Modules.Input.PerformActionsCommand))]
172172
[JsonSerializable(typeof(Modules.Input.ReleaseActionsCommand))]
173+
[JsonSerializable(typeof(Modules.Input.SetFilesCommand))]
173174
[JsonSerializable(typeof(Modules.Input.Pointer.Down), TypeInfoPropertyName = "Input_Pointer_Down")]
174175
[JsonSerializable(typeof(Modules.Input.Pointer.Up), TypeInfoPropertyName = "Input_Pointer_Up")]
175176
[JsonSerializable(typeof(Modules.Input.Pointer.Move), TypeInfoPropertyName = "Input_Pointer_Move")]

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextInputModule.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,9 @@ public Task ReleaseActionsAsync(ReleaseActionsOptions? options = null)
3434
{
3535
return inputModule.ReleaseActionsAsync(context, options);
3636
}
37+
38+
public Task SetFilesAsync(Script.ISharedReference element, IEnumerable<string> files, SetFilesOptions? options = null)
39+
{
40+
return inputModule.SetFilesAsync(context, element, files, options);
41+
}
3742
}

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/UserPromptOpenedEventArgs.cs

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

2222
namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
2323

24-
public record UserPromptOpenedEventArgs(BiDi BiDi, BrowsingContext Context, UserPromptType Type, string Message)
24+
public record UserPromptOpenedEventArgs(BiDi BiDi, BrowsingContext Context, Session.UserPromptHandlerType Handler, UserPromptType Type, string Message)
2525
: BrowsingContextEventArgs(BiDi, Context)
2626
{
2727
[JsonInclude]

dotnet/src/webdriver/BiDi/Modules/Input/InputModule.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,11 @@ public async Task ReleaseActionsAsync(BrowsingContext.BrowsingContext context, R
3838

3939
await Broker.ExecuteCommandAsync(new ReleaseActionsCommand(@params), options).ConfigureAwait(false);
4040
}
41+
42+
public async Task SetFilesAsync(BrowsingContext.BrowsingContext context, Script.ISharedReference element, IEnumerable<string> files, SetFilesOptions? options = null)
43+
{
44+
var @params = new SetFilesCommandParameters(context, element, files);
45+
46+
await Broker.ExecuteCommandAsync(new SetFilesCommand(@params), options).ConfigureAwait(false);
47+
}
4148
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// <copyright file="SetFilesCommand.cs" company="Selenium Committers">
2+
// Licensed to the Software Freedom Conservancy (SFC) under one
3+
// or more contributor license agreements. See the NOTICE file
4+
// distributed with this work for additional information
5+
// regarding copyright ownership. The SFC licenses this file
6+
// to you under the Apache License, Version 2.0 (the
7+
// "License"); you may not use this file except in compliance
8+
// with the License. You may obtain a copy of the License at
9+
//
10+
// http://www.apache.org/licenses/LICENSE-2.0
11+
//
12+
// Unless required by applicable law or agreed to in writing,
13+
// software distributed under the License is distributed on an
14+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
// KIND, either express or implied. See the License for the
16+
// specific language governing permissions and limitations
17+
// under the License.
18+
// </copyright>
19+
20+
using OpenQA.Selenium.BiDi.Communication;
21+
using System.Collections.Generic;
22+
23+
namespace OpenQA.Selenium.BiDi.Modules.Input;
24+
25+
internal class SetFilesCommand(SetFilesCommandParameters @params)
26+
: Command<SetFilesCommandParameters>(@params, "input.setFiles");
27+
28+
internal record SetFilesCommandParameters(BrowsingContext.BrowsingContext Context, Script.ISharedReference Element, IEnumerable<string> Files) : CommandParameters;
29+
30+
public record SetFilesOptions : CommandOptions;

dotnet/src/webdriver/BiDi/Modules/Session/CapabilitiesRequest.cs

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

2222
namespace OpenQA.Selenium.BiDi.Modules.Session;
2323

24-
public class CapabilitiesRequest
24+
public record CapabilitiesRequest
2525
{
2626
public CapabilityRequest? AlwaysMatch { get; set; }
2727

dotnet/src/webdriver/BiDi/Modules/Session/CapabilityRequest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
namespace OpenQA.Selenium.BiDi.Modules.Session;
2121

22-
public class CapabilityRequest
22+
public record CapabilityRequest
2323
{
2424
public bool? AcceptInsecureCerts { get; set; }
2525

@@ -31,5 +31,5 @@ public class CapabilityRequest
3131

3232
public ProxyConfiguration? ProxyConfiguration { get; set; }
3333

34-
public bool? WebSocketUrl { get; set; }
34+
public UserPromptHandler? UnhandledPromptBehavior { get; set; }
3535
}

0 commit comments

Comments
 (0)