Skip to content

Commit eb0ac57

Browse files
committed
Merge remote-tracking branch 'upstream/trunk' into dotnet-bidi-second-round
2 parents 7681685 + fbdc7a5 commit eb0ac57

File tree

76 files changed

+6027
-11929
lines changed

Some content is hidden

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

76 files changed

+6027
-11929
lines changed

.github/workflows/ci-dotnet.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ jobs:
2323
java-version: 17
2424
os: windows
2525
run: |
26+
fsutil 8dot3name set 0
2627
bazel test //dotnet/test/common:ElementFindingTest-firefox //dotnet/test/common:ElementFindingTest-chrome --pin_browsers=true

.github/workflows/ci-java.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
# https://github.com/bazelbuild/rules_jvm_external/issues/1046
2323
java-version: 17
2424
run: |
25+
fsutil 8dot3name set 0
2526
bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest `
2627
//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest `
2728
//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest `

MODULE.bazel

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ bazel_dep(name = "protobuf", version = "21.7", dev_dependency = True, repo_name
1717
# Required for rules_rust to import the crates properly
1818
bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
1919

20-
bazel_dep(name = "rules_dotnet", version = "0.15.1")
20+
bazel_dep(name = "rules_dotnet", version = "0.16.0")
2121
bazel_dep(name = "rules_java", version = "7.11.1")
2222
bazel_dep(name = "rules_jvm_external", version = "6.3")
23-
bazel_dep(name = "rules_nodejs", version = "6.2.0")
23+
bazel_dep(name = "rules_nodejs", version = "6.3.0")
2424
bazel_dep(name = "rules_oci", version = "1.7.6")
2525
bazel_dep(name = "rules_pkg", version = "0.10.1")
2626
bazel_dep(name = "rules_python", version = "0.33.0")
@@ -76,7 +76,7 @@ rules_ts_ext.deps(
7676
use_repo(rules_ts_ext, "npm_typescript")
7777

7878
esbuild = use_extension("@aspect_rules_esbuild//esbuild:extensions.bzl", "esbuild")
79-
esbuild.toolchain(esbuild_version = "0.19.9")
79+
esbuild.toolchain(esbuild_version = "0.23.0")
8080
use_repo(esbuild, "esbuild_toolchains")
8181

8282
register_toolchains("@esbuild_toolchains//:all")
@@ -178,8 +178,7 @@ maven.install(
178178
"com.google.auto.service:auto-service:1.1.1",
179179
"com.google.auto.service:auto-service-annotations:1.1.1",
180180
"com.google.googlejavaformat:google-java-format:jar:1.23.0",
181-
"com.graphql-java:graphql-java:20.2",
182-
"com.graphql-java:java-dataloader:3.2.0",
181+
"com.graphql-java:graphql-java:22.3",
183182
"dev.failsafe:failsafe:3.3.2",
184183
"io.grpc:grpc-context:1.66.0",
185184
"io.lettuce:lettuce-core:6.4.0.RELEASE",

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Selenium
22

33
[![CI](https://github.com/SeleniumHQ/selenium/actions/workflows/ci.yml/badge.svg?branch=trunk&event=schedule)](https://github.com/SeleniumHQ/selenium/actions/workflows/ci.yml)
4+
[![Releases downloads](https://img.shields.io/github/downloads/SeleniumHQ/selenium/total.svg)](https://github.com/SeleniumHQ/selenium/releases)
45

56
<a href="https://selenium.dev"><img src="common/images/selenium_logo_mark_green.svg" width="180" alt="Selenium Logo"/></a>
67

Rakefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ namespace :node do
483483
new_version = updated_version(old_version, arguments[:version], nightly)
484484

485485
['javascript/node/selenium-webdriver/package.json',
486-
'package-lock.json',
487486
'javascript/node/selenium-webdriver/BUILD.bazel'].each do |file|
488487
text = File.read(file).gsub(old_version, new_version)
489488
File.open(file, 'w') { |f| f.puts text }
@@ -1050,8 +1049,7 @@ namespace :all do
10501049
'py/BUILD.bazel',
10511050
'py/setup.py',
10521051
'rb/lib/selenium/webdriver/version.rb',
1053-
'rb/Gemfile.lock',
1054-
'package-lock.json'])
1052+
'rb/Gemfile.lock'])
10551053

10561054
print 'Do you want to push the committed changes? (Y/n): '
10571055
response = $stdin.gets.chomp.downcase
@@ -1106,7 +1104,6 @@ namespace :all do
11061104
'java/version.bzl',
11071105
'javascript/node/selenium-webdriver/CHANGES.md',
11081106
'javascript/node/selenium-webdriver/package.json',
1109-
'package-lock.json',
11101107
'py/docs/source/conf.py',
11111108
'py/selenium/__init__.py',
11121109
'py/selenium/webdriver/__init__.py',

WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ rules_closure_toolchains()
3434

3535
http_archive(
3636
name = "rules_rust",
37-
integrity = "sha256-JLN47ZcAbx9wEr5Jiib4HduZATGLiDgK7oUi/fvotzU=",
38-
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.42.1/rules_rust-v0.42.1.tar.gz"],
37+
integrity = "sha256-Zx3bP+Xrz53TTQUeynNS+68z+lO/Ye7Qt1pMNIKeVIA=",
38+
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.52.2/rules_rust-v0.52.2.tar.gz"],
3939
)
4040

4141
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
89 Bytes
Binary file not shown.

common/extensions/webextensions-selenium-example/manifest.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
]
1515
}
1616
],
17+
"permissions": [
18+
"storage",
19+
"scripting"
20+
],
21+
"host_permissions": [
22+
"https://*/*",
23+
"http://*/*"
24+
],
1725
"browser_specific_settings": {
1826
"gecko": {
1927

dotnet/src/webdriver/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ csharp_library(
5555
framework("nuget", "Microsoft.Bcl.AsyncInterfaces"),
5656
framework("nuget", "System.Threading.Tasks.Extensions"),
5757
framework("nuget", "System.Memory"),
58+
framework("nuget", "System.Text.Encodings.Web"),
5859
framework("nuget", "System.Text.Json"),
5960
],
6061
)
@@ -119,6 +120,7 @@ csharp_library(
119120
framework("nuget", "Microsoft.Bcl.AsyncInterfaces"),
120121
framework("nuget", "System.Threading.Tasks.Extensions"),
121122
framework("nuget", "System.Memory"),
123+
framework("nuget", "System.Text.Encodings.Web"),
122124
framework("nuget", "System.Text.Json"),
123125
],
124126
)

dotnet/src/webdriver/NetworkManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public NetworkManager(IWebDriver driver)
4545
this.session = new Lazy<DevToolsSession>(() =>
4646
{
4747
IDevTools devToolsDriver = driver as IDevTools;
48-
if (session == null)
48+
if (devToolsDriver == null)
4949
{
5050
throw new WebDriverException("Driver must implement IDevTools to use these features");
5151
}

0 commit comments

Comments
 (0)