Skip to content

Commit d1af92a

Browse files
committed
Merge remote-tracking branch 'origin/rb_add_support_for_chrome_beta' into rb_add_support_for_chrome_beta
# Conflicts: # common/repositories.bzl
2 parents 8e5b869 + 6d74604 commit d1af92a

File tree

252 files changed

+836
-1599
lines changed

Some content is hidden

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

252 files changed

+836
-1599
lines changed

.github/workflows/bazel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
node-version: ${{ inputs.node-version }}
123123
- name: Setup Bazel with caching
124124
if: inputs.caching
125-
uses: bazel-contrib/setup-bazel@0.13.0
125+
uses: bazel-contrib/setup-bazel@0.15.0
126126
with:
127127
bazelisk-cache: true
128128
bazelrc: common --color=yes
@@ -136,7 +136,7 @@ jobs:
136136
repository-cache: true
137137
- name: Setup Bazel without caching
138138
if: inputs.caching == false
139-
uses: bazel-contrib/setup-bazel@0.13.0
139+
uses: bazel-contrib/setup-bazel@0.15.0
140140
with:
141141
bazelrc: common --color=yes
142142
- name: Setup curl for Ubuntu

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
fetch-depth: 50
2727
- name: Setup Bazel
28-
uses: bazel-contrib/setup-bazel@0.13.0
28+
uses: bazel-contrib/setup-bazel@0.15.0
2929
with:
3030
bazelisk-cache: true
3131
cache-version: 2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ py/selenium/webdriver/remote/getAttribute.js
7575
py/selenium/webdriver/remote/isDisplayed.js
7676
py/docs/build/
7777
py/docs/source/**/*
78+
!py/docs/source/conf.py
7879
py/build/
7980
py/LICENSE
8081
py/pytestdebug.log

MODULE.bazel

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module(name = "selenium")
22

33
bazel_dep(name = "apple_rules_lint", version = "0.4.0")
4-
bazel_dep(name = "aspect_rules_lint", version = "1.4.2")
54
bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
65
bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
76
bazel_dep(name = "aspect_rules_js", version = "2.3.7")
@@ -21,6 +20,7 @@ bazel_dep(name = "rules_cc", version = "0.1.1", dev_dependency = True)
2120
bazel_dep(name = "rules_dotnet", version = "0.17.5")
2221
bazel_dep(name = "rules_java", version = "8.7.1")
2322
bazel_dep(name = "rules_jvm_external", version = "6.6")
23+
bazel_dep(name = "rules_multitool", version = "1.3.0")
2424
bazel_dep(name = "rules_nodejs", version = "6.3.2")
2525
bazel_dep(name = "rules_oci", version = "1.8.0")
2626
bazel_dep(name = "rules_pkg", version = "1.0.1")
@@ -37,6 +37,10 @@ git_override(
3737
remote = "https://github.com/bazel-contrib/rules_jvm_external.git",
3838
)
3939

40+
multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
41+
multitool.hub(lockfile = "//:multitool.lock.json")
42+
use_repo(multitool, "multitool")
43+
4044
linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
4145
linter.configure(
4246
name = "java-spotbugs",

common/mirror/selenium

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,33 @@
33
"tag_name": "nightly",
44
"assets": [
55
{
6-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.33.0-SNAPSHOT.zip"
6+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.34.0-SNAPSHOT.zip"
77
},
88
{
9-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.33.0-SNAPSHOT.jar"
9+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.34.0-SNAPSHOT.jar"
1010
},
1111
{
12-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.33.0-SNAPSHOT.zip"
12+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.34.0-SNAPSHOT.zip"
13+
}
14+
]
15+
},
16+
{
17+
"tag_name": "selenium-4.33.0",
18+
"assets": [
19+
{
20+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.33.0/selenium-dotnet-4.33.0.zip"
21+
},
22+
{
23+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.33.0/selenium-dotnet-strongnamed-4.33.0.zip"
24+
},
25+
{
26+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.33.0/selenium-java-4.33.0.zip"
27+
},
28+
{
29+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.33.0/selenium-server-4.33.0.jar"
30+
},
31+
{
32+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.33.0/selenium-server-4.33.0.zip"
1333
}
1434
]
1535
},
@@ -836,25 +856,5 @@
836856
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.5.0/selenium-server-4.5.3.zip"
837857
}
838858
]
839-
},
840-
{
841-
"tag_name": "selenium-4.4.0",
842-
"assets": [
843-
{
844-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.4.0/selenium-dotnet-4.4.0.zip"
845-
},
846-
{
847-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.4.0/selenium-dotnet-strongnamed-4.4.0.zip"
848-
},
849-
{
850-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.4.0/selenium-java-4.4.0.zip"
851-
},
852-
{
853-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.4.0/selenium-server-4.4.0.jar"
854-
},
855-
{
856-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.4.0/selenium-server-4.4.0.zip"
857-
}
858-
]
859859
}
860860
]

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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717
// under the License.
1818
// </copyright>
1919

20-
using System.Collections.Generic;
2120
using System.Threading.Tasks;
2221
using OpenQA.Selenium.BiDi.Communication;
2322

24-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
23+
namespace OpenQA.Selenium.BiDi.Browser;
2524

2625
public sealed class BrowserModule(Broker broker) : Module(broker)
2726
{
@@ -32,7 +31,9 @@ public async Task CloseAsync(CloseOptions? options = null)
3231

3332
public async Task<UserContextInfo> CreateUserContextAsync(CreateUserContextOptions? options = null)
3433
{
35-
return await Broker.ExecuteCommandAsync<CreateUserContextCommand, UserContextInfo>(new CreateUserContextCommand(), options).ConfigureAwait(false);
34+
var @params = new CreateUserContextCommandParameters(options?.AcceptInsecureCerts, options?.Proxy);
35+
36+
return await Broker.ExecuteCommandAsync<CreateUserContextCommand, UserContextInfo>(new CreateUserContextCommand(@params), options).ConfigureAwait(false);
3637
}
3738

3839
public async Task<GetUserContextsResult> GetUserContextsAsync(GetUserContextsOptions? options = null)

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");

0 commit comments

Comments
 (0)