Skip to content

Commit 05d8829

Browse files
nvborisenkonvborisenko
committed
Merge remote-tracking branch 'upstream/trunk' into dotnet-aot-classic
2 parents f26429b + 1b64798 commit 05d8829

File tree

49 files changed

+5265
-11760
lines changed

Some content is hidden

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

49 files changed

+5265
-11760
lines changed

‎MODULE.bazel‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
2020
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")

‎dotnet/src/webdriver/PrintOptions.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,27 @@ public bool ShrinkToFit
101101
}
102102

103103
/// <summary>
104-
/// Gets the dimensions for each page in the printed document.
104+
/// Gets or sets the dimensions for each page in the printed document.
105105
/// </summary>
106106
public PageSize PageDimensions
107107
{
108108
get { return pageSize; }
109+
set
110+
{
111+
pageSize = value ?? throw new ArgumentNullException(nameof(value));
112+
}
109113
}
110114

111115
/// <summary>
112-
/// Gets the margins for each page in the doucment.
116+
/// Gets or sets the margins for each page in the doucment.
113117
/// </summary>
114118
public Margins PageMargins
115119
{
116120
get { return margins; }
121+
set
122+
{
123+
margins = value ?? throw new ArgumentNullException(nameof(value));
124+
}
117125
}
118126

119127
/// <summary>

‎dotnet/src/webdriver/WebDriver.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
</Target>
107107

108108
<Target Name="GenerateCdp" BeforeTargets="CoreCompile">
109-
<Exec Command="bazel build //dotnet/src/webdriver/cdp:generate-v85 //dotnet/src/webdriver/cdp:generate-v127 //dotnet/src/webdriver/cdp:generate-v128 //dotnet/src/webdriver/cdp:generate-v129" WorkingDirectory="../../.." />
109+
<Exec Command="bazel build //dotnet/src/webdriver/cdp/..." WorkingDirectory="../../.." />
110110

111111
<ItemGroup>
112112
<Compile Include="..\..\..\bazel-bin\dotnet\src\webdriver\cdp\**\*.cs" LinkBase="DevTools\generated" />

‎dotnet/src/webdriver/cdp/README.md‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,4 @@ perform the following steps, where `<N>` is the major version of the protocol:
5252
remove the entry for version `<N>` from the `SupportedDevToolsVersions` dictionary initialization.
5353
3. Remove the version string (`v<N>`) from the `SUPPORTED_DEVTOOLS_VERSIONS` list in
5454
[`//dotnet:selenium-dotnet-version.bzl`](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/selenium-dotnet-version.bzl).
55-
4. In [`//dotnet/src/webdriver:WebDriver.csproj.prebuild.cmd`](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd),
56-
remove the `if not exist` block for version `<N>`.
57-
5. In [`//dotnet/src/webdriver:WebDriver.csproj.prebuild.sh`](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh),
58-
remove the `if-fi` block for version `<N>`.
59-
6. Commit the changes.
60-
55+
4. Commit the changes.

‎dotnet/test/common/DriverTestFixture.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ public abstract class DriverTestFixture
8888
public string scrollFrameOutOfViewport = EnvironmentManager.Instance.UrlBuilder.WhereIs("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html");
8989
public string scrollFrameInViewport = EnvironmentManager.Instance.UrlBuilder.WhereIs("scrolling_tests/frame_with_nested_scrolling_frame.html");
9090

91+
public string printPage = EnvironmentManager.Instance.UrlBuilder.WhereIs("printPage.html");
92+
9193
protected IWebDriver driver;
9294

9395
public IWebDriver DriverInstance

‎dotnet/test/common/PrintTest.cs‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
using NUnit.Framework;
2+
using System;
3+
4+
namespace OpenQA.Selenium
5+
{
6+
[TestFixture]
7+
public class PrintTest : DriverTestFixture
8+
{
9+
private const string MagicString = "JVBER";
10+
private ISupportsPrint printer;
11+
12+
[SetUp]
13+
public void LocalSetUp()
14+
{
15+
Assert.That(driver, Is.InstanceOf<ISupportsPrint>(), $"Driver does not support {nameof(ISupportsPrint)}.");
16+
17+
printer = driver as ISupportsPrint;
18+
19+
driver.Navigate().GoToUrl(this.printPage);
20+
}
21+
22+
[Test]
23+
public void CanPrintPage()
24+
{
25+
var pdf = printer.Print(new PrintOptions());
26+
27+
Assert.That(pdf.AsBase64EncodedString, Does.Contain(MagicString));
28+
}
29+
30+
[Test]
31+
public void CanPrintTwoPages()
32+
{
33+
var options = new PrintOptions();
34+
35+
options.AddPageRangeToPrint("1-2");
36+
37+
var pdf = printer.Print(options);
38+
39+
Assert.That(pdf.AsBase64EncodedString, Does.Contain(MagicString));
40+
}
41+
42+
[Test]
43+
public void CanPrintWithMostParams()
44+
{
45+
var options = new PrintOptions()
46+
{
47+
Orientation = PrintOrientation.Landscape,
48+
ScaleFactor = 0.5,
49+
PageDimensions = new PrintOptions.PageSize { Width = 200, Height = 100 },
50+
PageMargins = new PrintOptions.Margins { Top = 1, Bottom = 1, Left = 2, Right = 2 },
51+
OutputBackgroundImages = true,
52+
ShrinkToFit = false
53+
};
54+
55+
options.AddPageRangeToPrint("1-3");
56+
57+
var pdf = printer.Print(options);
58+
59+
Assert.That(pdf.AsBase64EncodedString, Does.Contain(MagicString));
60+
}
61+
62+
[Test]
63+
public void PageSizeCannotBeNull()
64+
{
65+
Assert.That(() => new PrintOptions { PageDimensions = null }, Throws.InstanceOf<ArgumentNullException>());
66+
}
67+
68+
[Test]
69+
public void MarginsCannotBeNull()
70+
{
71+
Assert.That(() => new PrintOptions { PageMargins = null }, Throws.InstanceOf<ArgumentNullException>());
72+
}
73+
}
74+
}

‎java/maven_install.json‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -809854593,
4-
"__RESOLVED_ARTIFACTS_HASH": -1445024694,
3+
"__INPUT_ARTIFACTS_HASH": -1369959342,
4+
"__RESOLVED_ARTIFACTS_HASH": 2051378450,
55
"conflict_resolution": {
66
"com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
77
"com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.28.0",
@@ -194,17 +194,17 @@
194194
},
195195
"com.graphql-java:graphql-java": {
196196
"shasums": {
197-
"jar": "98c63c1bf51876f84a3770573279be4f98bbfc2c86d6b4819c327fa1cbd2b137",
198-
"sources": "2f8be51261734b4618551724a5730d1e6299a9adda171178027eacdc8010363a"
197+
"jar": "8828fef5d8133d3d5ad23cee262a9b3ab4ce95aedf5e3332bb577a9aa7c627e0",
198+
"sources": "122d4adc1c1491f86f08f6ba6206aa9f05d14a02cf36c73baad7e1d8034160a7"
199199
},
200-
"version": "20.2"
200+
"version": "22.3"
201201
},
202202
"com.graphql-java:java-dataloader": {
203203
"shasums": {
204-
"jar": "b9c7d32aef05a2e33dc07c5ce45b713c405b61c6264cb0ed48aac003add3eaa4",
205-
"sources": "ffecf802d587b05860d8ab116d3c6a8630f8eca5d3b5da783f8dd085e2ca0591"
204+
"jar": "08cec84ac76e32b53ea666260f288f10b3731c21c89f9199b109ced2361f78b8",
205+
"sources": "cea71f74025c2ca95618113345f888c780a99bf3133621b54007e1babaef2e14"
206206
},
207-
"version": "3.2.0"
207+
"version": "3.3.0"
208208
},
209209
"commons-codec:commons-codec": {
210210
"shasums": {
@@ -900,8 +900,7 @@
900900
],
901901
"com.graphql-java:graphql-java": [
902902
"com.graphql-java:java-dataloader",
903-
"org.reactivestreams:reactive-streams",
904-
"org.slf4j:slf4j-api"
903+
"org.reactivestreams:reactive-streams"
905904
],
906905
"com.graphql-java:java-dataloader": [
907906
"org.slf4j:slf4j-api"
@@ -1425,16 +1424,18 @@
14251424
],
14261425
"com.graphql-java:graphql-java": [
14271426
"graphql",
1427+
"graphql.agent.result",
14281428
"graphql.analysis",
14291429
"graphql.analysis.values",
1430-
"graphql.cachecontrol",
14311430
"graphql.collect",
14321431
"graphql.com.google.common.base",
14331432
"graphql.com.google.common.collect",
14341433
"graphql.com.google.common.math",
14351434
"graphql.com.google.common.primitives",
14361435
"graphql.execution",
1436+
"graphql.execution.conditional",
14371437
"graphql.execution.directives",
1438+
"graphql.execution.incremental",
14381439
"graphql.execution.instrumentation",
14391440
"graphql.execution.instrumentation.dataloader",
14401441
"graphql.execution.instrumentation.fieldvalidation",
@@ -1444,11 +1445,15 @@
14441445
"graphql.execution.preparsed",
14451446
"graphql.execution.preparsed.persisted",
14461447
"graphql.execution.reactive",
1448+
"graphql.execution.values",
1449+
"graphql.execution.values.legacycoercing",
14471450
"graphql.extensions",
14481451
"graphql.i18n",
1452+
"graphql.incremental",
14491453
"graphql.introspection",
14501454
"graphql.language",
14511455
"graphql.normalized",
1456+
"graphql.normalized.incremental",
14521457
"graphql.org.antlr.v4.runtime",
14531458
"graphql.org.antlr.v4.runtime.atn",
14541459
"graphql.org.antlr.v4.runtime.dfa",
@@ -1466,7 +1471,6 @@
14661471
"graphql.schema.diff.reporting",
14671472
"graphql.schema.diffing",
14681473
"graphql.schema.diffing.ana",
1469-
"graphql.schema.diffing.dot",
14701474
"graphql.schema.fetching",
14711475
"graphql.schema.idl",
14721476
"graphql.schema.idl.errors",
@@ -1475,6 +1479,7 @@
14751479
"graphql.schema.usage",
14761480
"graphql.schema.validation",
14771481
"graphql.schema.visibility",
1482+
"graphql.schema.visitor",
14781483
"graphql.util",
14791484
"graphql.validation",
14801485
"graphql.validation.rules"
@@ -1484,6 +1489,7 @@
14841489
"org.dataloader.annotations",
14851490
"org.dataloader.impl",
14861491
"org.dataloader.registries",
1492+
"org.dataloader.scheduler",
14871493
"org.dataloader.stats",
14881494
"org.dataloader.stats.context"
14891495
],

0 commit comments

Comments
 (0)