Skip to content

Commit 032f4c6

Browse files
navin772navin772
authored
Merge branch 'trunk' into py-bidi-emulation
2 parents 297ef0b + 3bd4afb commit 032f4c6

File tree

189 files changed

+370
-5077
lines changed

Some content is hidden

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

189 files changed

+370
-5077
lines changed

‎common/repositories.bzl‎

Lines changed: 9 additions & 9 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/139.0/linux-x86_64/en-US/firefox-139.0.tar.xz",
15-
sha256 = "1e3eab20cb84af1510b22e663438bd31ee1473652e10eb48661dcc6f1c0bbbe8",
14+
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/en-US/firefox-139.0.1.tar.xz",
15+
sha256 = "f1a264f61d41700e8fcfa2310478d0c909655399a413072664fddaf612b53c07",
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/139.0/mac/en-US/Firefox%20139.0.dmg",
37-
sha256 = "03f1066b70b6e502c4f1a732a63f9f93146c6ea23d0af5e2e3a57d030e255353",
36+
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0.1/mac/en-US/Firefox%20139.0.1.dmg",
37+
sha256 = "243478e2a2fd5d9dd0cc261c812b0146e433d703fec960c27c7284b2de7e65bc",
3838
build_file_content = """
3939
load("@aspect_rules_js//js:defs.bzl", "js_library")
4040
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/0db7b32d-8b37-45ad-b2d9-b6b6cfcf91bd/MicrosoftEdge-136.0.3240.92.pkg",
127-
sha256 = "c3407b12244a854928d5731c5c52be41905ab7f7689a50503929ed21c1fe15e2",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/a79f2827-2aae-47ec-b8ac-cbacd67e057a/MicrosoftEdge-137.0.3296.52.pkg",
127+
sha256 = "08d29e9b89d2b2789bab08c70530226a7bd700835a35b5fb2f458a06d057765d",
128128
move = {
129-
"MicrosoftEdge-136.0.3240.92.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-137.0.3296.52.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_136.0.3240.92-1_amd64.deb",
147-
sha256 = "04b4287e74be559c365f36beb38fa8233de24ed8c8a17d95d9ce83547951d8c3",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_137.0.3296.52-1_amd64.deb",
147+
sha256 = "b2041c75e61d0c6530ec7565a63c2458e5e53aa5bb759b354e27c9dfe0d83d37",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
package(default_visibility = ["//visibility:public"])

‎dotnet/src/support/Settings.StyleCop‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎dotnet/src/support/WebDriver.Support.csproj‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@
3232
<GenerateDocumentationFile>true</GenerateDocumentationFile>
3333
</PropertyGroup>
3434

35-
<ItemGroup>
36-
<Compile Remove="obj\**" />
37-
<EmbeddedResource Remove="obj\**" />
38-
<None Remove="obj\**" />
39-
</ItemGroup>
40-
41-
<ItemGroup>
42-
<None Remove="Settings.StyleCop" />
43-
<None Remove="WebDriver.Support.ruleset" />
44-
</ItemGroup>
45-
4635
<PropertyGroup>
4736
<CsprojIncludePath>..\webdriver</CsprojIncludePath>
4837
</PropertyGroup>

‎dotnet/src/support/WebDriver.Support.ruleset‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@ public class BiDi : IAsyncDisposable
2727
{
2828
private readonly Broker _broker;
2929

30-
private readonly Lazy<Modules.Session.SessionModule> _sessionModule;
31-
private readonly Lazy<Modules.BrowsingContext.BrowsingContextModule> _browsingContextModule;
32-
private readonly Lazy<Modules.Browser.BrowserModule> _browserModule;
33-
private readonly Lazy<Modules.Network.NetworkModule> _networkModule;
34-
private readonly Lazy<Modules.Input.InputModule> _inputModule;
35-
private readonly Lazy<Modules.Script.ScriptModule> _scriptModule;
36-
private readonly Lazy<Modules.Log.LogModule> _logModule;
37-
private readonly Lazy<Modules.Storage.StorageModule> _storageModule;
30+
private readonly Lazy<Session.SessionModule> _sessionModule;
31+
private readonly Lazy<BrowsingContext.BrowsingContextModule> _browsingContextModule;
32+
private readonly Lazy<Browser.BrowserModule> _browserModule;
33+
private readonly Lazy<Network.NetworkModule> _networkModule;
34+
private readonly Lazy<Input.InputModule> _inputModule;
35+
private readonly Lazy<Script.ScriptModule> _scriptModule;
36+
private readonly Lazy<Log.LogModule> _logModule;
37+
private readonly Lazy<Storage.StorageModule> _storageModule;
3838

3939
internal BiDi(string url)
4040
{
4141
var uri = new Uri(url);
4242

4343
_broker = new Broker(this, uri);
4444

45-
_sessionModule = new Lazy<Modules.Session.SessionModule>(() => new Modules.Session.SessionModule(_broker));
46-
_browsingContextModule = new Lazy<Modules.BrowsingContext.BrowsingContextModule>(() => new Modules.BrowsingContext.BrowsingContextModule(_broker));
47-
_browserModule = new Lazy<Modules.Browser.BrowserModule>(() => new Modules.Browser.BrowserModule(_broker));
48-
_networkModule = new Lazy<Modules.Network.NetworkModule>(() => new Modules.Network.NetworkModule(_broker));
49-
_inputModule = new Lazy<Modules.Input.InputModule>(() => new Modules.Input.InputModule(_broker));
50-
_scriptModule = new Lazy<Modules.Script.ScriptModule>(() => new Modules.Script.ScriptModule(_broker));
51-
_logModule = new Lazy<Modules.Log.LogModule>(() => new Modules.Log.LogModule(_broker));
52-
_storageModule = new Lazy<Modules.Storage.StorageModule>(() => new Modules.Storage.StorageModule(_broker));
45+
_sessionModule = new Lazy<Session.SessionModule>(() => new Session.SessionModule(_broker));
46+
_browsingContextModule = new Lazy<BrowsingContext.BrowsingContextModule>(() => new BrowsingContext.BrowsingContextModule(_broker));
47+
_browserModule = new Lazy<Browser.BrowserModule>(() => new Browser.BrowserModule(_broker));
48+
_networkModule = new Lazy<Network.NetworkModule>(() => new Network.NetworkModule(_broker));
49+
_inputModule = new Lazy<Input.InputModule>(() => new Input.InputModule(_broker));
50+
_scriptModule = new Lazy<Script.ScriptModule>(() => new Script.ScriptModule(_broker));
51+
_logModule = new Lazy<Log.LogModule>(() => new Log.LogModule(_broker));
52+
_storageModule = new Lazy<Storage.StorageModule>(() => new Storage.StorageModule(_broker));
5353
}
5454

55-
internal Modules.Session.SessionModule SessionModule => _sessionModule.Value;
56-
public Modules.BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value;
57-
public Modules.Browser.BrowserModule Browser => _browserModule.Value;
58-
public Modules.Network.NetworkModule Network => _networkModule.Value;
59-
internal Modules.Input.InputModule InputModule => _inputModule.Value;
60-
public Modules.Script.ScriptModule Script => _scriptModule.Value;
61-
public Modules.Log.LogModule Log => _logModule.Value;
62-
public Modules.Storage.StorageModule Storage => _storageModule.Value;
55+
internal Session.SessionModule SessionModule => _sessionModule.Value;
56+
public BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value;
57+
public Browser.BrowserModule Browser => _browserModule.Value;
58+
public Network.NetworkModule Network => _networkModule.Value;
59+
internal Input.InputModule InputModule => _inputModule.Value;
60+
public Script.ScriptModule Script => _scriptModule.Value;
61+
public Log.LogModule Log => _logModule.Value;
62+
public Storage.StorageModule Storage => _storageModule.Value;
6363

64-
public Task<Modules.Session.StatusResult> StatusAsync()
64+
public Task<Session.StatusResult> StatusAsync()
6565
{
6666
return SessionModule.StatusAsync();
6767
}
@@ -75,7 +75,7 @@ public static async Task<BiDi> ConnectAsync(string url)
7575
return bidi;
7676
}
7777

78-
public Task EndAsync(Modules.Session.EndOptions? options = null)
78+
public Task EndAsync(Session.EndOptions? options = null)
7979
{
8080
return SessionModule.EndAsync(options);
8181
}

‎dotnet/src/webdriver/BiDi/Modules/Browser/BrowserModule.cs‎ renamed to ‎dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using System.Threading.Tasks;
2121
using OpenQA.Selenium.BiDi.Communication;
2222

23-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
23+
namespace OpenQA.Selenium.BiDi.Browser;
2424

2525
public sealed class BrowserModule(Broker broker) : Module(broker)
2626
{

‎dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindow.cs‎ renamed to ‎dotnet/src/webdriver/BiDi/Browser/ClientWindow.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// under the License.
1818
// </copyright>
1919

20-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
20+
namespace OpenQA.Selenium.BiDi.Browser;
2121

2222
public record ClientWindow
2323
{

‎dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindowInfo.cs‎ renamed to ‎dotnet/src/webdriver/BiDi/Browser/ClientWindowInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// under the License.
1818
// </copyright>
1919

20-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
20+
namespace OpenQA.Selenium.BiDi.Browser;
2121

2222
public record ClientWindowInfo(bool Active, ClientWindow ClientWindow, ClientWindowState State, int Height, int Width, int X, int Y);
2323

‎dotnet/src/webdriver/BiDi/Modules/Browser/CloseCommand.cs‎ renamed to ‎dotnet/src/webdriver/BiDi/Browser/CloseCommand.cs‎

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

2020
using OpenQA.Selenium.BiDi.Communication;
2121

22-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
22+
namespace OpenQA.Selenium.BiDi.Browser;
2323

2424
internal class CloseCommand()
2525
: Command<CommandParameters, EmptyResult>(CommandParameters.Empty, "browser.close");

‎dotnet/src/webdriver/BiDi/Modules/Browser/CreateUserContextCommand.cs‎ renamed to ‎dotnet/src/webdriver/BiDi/Browser/CreateUserContextCommand.cs‎

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

2020
using OpenQA.Selenium.BiDi.Communication;
2121

22-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
22+
namespace OpenQA.Selenium.BiDi.Browser;
2323

2424
internal class CreateUserContextCommand(CreateUserContextCommandParameters @params)
2525
: Command<CreateUserContextCommandParameters, UserContextInfo>(@params, "browser.createUserContext");

0 commit comments

Comments
 (0)