Skip to content

Commit 369193e

Browse files
AutomatedTesterAutomatedTester
authored
Merge branch 'trunk' into fix-deprecated-webserver-closing-method
2 parents 9d71ebe + bed68d1 commit 369193e

71 files changed

Lines changed: 2313 additions & 1731 deletions

File tree

Some content is hidden

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

‎WORKSPACE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ selenium_register_dotnet()
123123

124124
http_archive(
125125
name = "build_bazel_rules_nodejs",
126-
sha256 = "f7037c8e295fdc921f714962aee7c496110052511e2b14076bd8e2d46bc9819c",
127-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.4.5/rules_nodejs-4.4.5.tar.gz"],
126+
sha256 = "cfc289523cf1594598215901154a6c2515e8bf3671fd708264a6f6aefe02bf39",
127+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.4.6/rules_nodejs-4.4.6.tar.gz"],
128128
)
129129

130130
load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "npm_install")

‎common/repositories.bzl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ def pin_browsers():
3838

3939
pkg_archive(
4040
name = "mac_edge",
41-
url = "https://officecdn-microsoft-com.akamaized.net/pr/C1297A47-86C4-4C1F-97FA-950631F94777/MacAutoupdate/MicrosoftEdge-94.0.992.50.pkg?platform=Mac&Consent=0&channel=Stable",
42-
sha256 = "2d3e1f6c5dc01f64c18c80b1bbbcc1cc2a07c72c7b870f3b2dd167a87846ae06",
41+
url = "https://officecdn-microsoft-com.akamaized.net/pr/C1297A47-86C4-4C1F-97FA-950631F94777/MacAutoupdate/MicrosoftEdge-96.0.1054.34.pkg?platform=Mac&Consent=1&channel=Stable",
42+
sha256 = "6c2a4966dfc164e17ca27a9326ca115674b55f8f0f128e6b0c80da1fc0bf228d",
4343
move = {
44-
"MicrosoftEdge-94.0.992.50.pkg/Payload/Microsoft Edge.app": "Edge.app",
44+
"MicrosoftEdge-96.0.1054.34.pkg/Payload/Microsoft Edge.app": "Edge.app",
4545
},
4646
build_file_content = "exports_files([\"Edge.app\"])",
4747
)
4848

4949
http_archive(
5050
name = "mac_edgedriver",
51-
url = "https://msedgedriver.azureedge.net/94.0.992.50/edgedriver_mac64.zip",
52-
sha256 = "f5446a97c7ccd9d80904b1888b28fa5c9eb624b233aa05f046f825b1d8965f3f",
51+
url = "https://msedgedriver.azureedge.net/96.0.1025.0/edgedriver_mac64.zip",
52+
sha256 = "0bcf934ce4b2b57f268e72096817fc6aad2b763e3541fa2d510ece3efc816bab",
5353
build_file_content = "exports_files([\"msedgedriver\"])",
5454
)
5555

‎common/src/web/pointerActionsPage.html‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<!--This page has been copied from https://github.com/web-platform-tests/wpt/blob/18ce0b235b34d94aa609088329f0e18499ed5847/webdriver/tests/perform_actions/support/test_actions_pointer_wdspec.html-->
2+
3+
<!doctype html>
4+
<meta charset=utf-8>
5+
<html>
6+
7+
<head>
8+
<title>Test Actions</title>
9+
<style>
10+
div {
11+
padding: 0px;
12+
margin: 0px;
13+
}
14+
15+
#trackPointer {
16+
position: fixed;
17+
}
18+
19+
#resultContainer {
20+
width: 600px;
21+
height: 60px;
22+
}
23+
24+
.area {
25+
width: 100px;
26+
height: 50px;
27+
background-color: #ccc;
28+
}
29+
</style>
30+
<script>
31+
"use strict";
32+
var els = {};
33+
var allEvents = { events: [] };
34+
function displayMessage(message) {
35+
document.getElementById("events").innerHTML = "<p>" + message + "</p>";
36+
}
37+
38+
function appendMessage(message) {
39+
document.getElementById("events").innerHTML += "<p>" + message + "</p>";
40+
}
41+
42+
function recordPointerEvent(event) {
43+
if (event.type === "contextmenu") {
44+
event.preventDefault();
45+
}
46+
allEvents.events.push({
47+
"type": event.type,
48+
"button": event.button,
49+
"buttons": event.buttons,
50+
"pageX": event.pageX,
51+
"pageY": event.pageY,
52+
"ctrlKey": event.ctrlKey,
53+
"metaKey": event.metaKey,
54+
"altKey": event.altKey,
55+
"shiftKey": event.shiftKey,
56+
"target": event.target.id,
57+
"pointerType": event.pointerType,
58+
"width": event.width,
59+
"height": event.height,
60+
"pressure": event.pressure,
61+
"tangentialPressure": event.tangentialPressure,
62+
"tiltX": event.tiltX,
63+
"tiltY": event.tiltY,
64+
"twist": event.twist,
65+
"altitudeAngle": event.altitudeAngle,
66+
"azimuthAngle": event.azimuthAngle
67+
});
68+
appendMessage(event.type + " " +
69+
"button: " + event.button + ", " +
70+
"pageX: " + event.pageX + ", " +
71+
"pageY: " + event.pageY + ", " +
72+
"button: " + event.button + ", " +
73+
"buttons: " + event.buttons + ", " +
74+
"ctrlKey: " + event.ctrlKey + ", " +
75+
"altKey: " + event.altKey + ", " +
76+
"metaKey: " + event.metaKey + ", " +
77+
"shiftKey: " + event.shiftKey + ", " +
78+
"target id: " + event.target.id + ", " +
79+
"pointerType: " + event.pointerType + ", " +
80+
"width: " + event.width + ", " +
81+
"height: " + event.height + ", " +
82+
"pressure: " + event.pressure + ", " +
83+
"tangentialPressure: " + event.tangentialPressure + ", " +
84+
"tiltX: " + event.tiltX + ", " +
85+
"tiltY: " + event.tiltY + ", " +
86+
"twist: " + event.twist + ", " +
87+
"altitudeAngle: " + event.altitudeAngle + ", " +
88+
"azimuthAngle: " + event.azimuthAngle);
89+
}
90+
91+
function resetEvents() {
92+
allEvents.events.length = 0;
93+
displayMessage("");
94+
}
95+
96+
document.addEventListener("DOMContentLoaded", function () {
97+
var pointerArea = document.getElementById("pointerArea");
98+
pointerArea.addEventListener("pointerdown", recordPointerEvent);
99+
pointerArea.addEventListener("pointermove", recordPointerEvent);
100+
pointerArea.addEventListener("pointerup", recordPointerEvent);
101+
pointerArea.addEventListener("pointerover", recordPointerEvent);
102+
pointerArea.addEventListener("pointerenter", recordPointerEvent);
103+
pointerArea.addEventListener("pointerout", recordPointerEvent);
104+
pointerArea.addEventListener("pointerleave", recordPointerEvent);
105+
});
106+
</script>
107+
</head>
108+
109+
<body>
110+
<div id="trackPointer" class="block"></div>
111+
<div>
112+
<h2>PointerReporter</h2>
113+
<div id="pointerArea" class="area">
114+
</div>
115+
</div>
116+
<div id="resultContainer">
117+
<h2>Events</h2>
118+
<div id="events"></div>
119+
</div>
120+
</body>
121+
122+
</html>

‎common/src/web/scrollingPage.html‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<!--Copied from https://github.com/web-platform-tests/wpt/blob/master/webdriver/tests/perform_actions/support/test_actions_scroll_wdspec.html-->
2+
3+
<!doctype html>
4+
<meta charset=utf-8>
5+
<html>
6+
7+
<head>
8+
<title>Test Actions</title>
9+
<style>
10+
div {
11+
padding: 0px;
12+
margin: 0px;
13+
}
14+
15+
.area {
16+
width: 100px;
17+
height: 50px;
18+
background-color: #ccc;
19+
}
20+
21+
#scrollable {
22+
width: 100px;
23+
height: 100px;
24+
overflow: scroll;
25+
}
26+
27+
#scrollContent {
28+
width: 600px;
29+
height: 1000px;
30+
background-color: blue;
31+
}
32+
33+
#subframe {
34+
width: 100px;
35+
height: 100px;
36+
}
37+
</style>
38+
<script>
39+
"use strict";
40+
var els = {};
41+
var allEvents = { events: [] };
42+
function displayMessage(message) {
43+
document.getElementById("events").innerHTML = "<p>" + message + "</p>";
44+
}
45+
46+
function appendMessage(message) {
47+
document.getElementById("events").innerHTML += "<p>" + message + "</p>";
48+
}
49+
50+
function recordWheelEvent(event) {
51+
allEvents.events.push({
52+
"type": event.type,
53+
"button": event.button,
54+
"buttons": event.buttons,
55+
"deltaX": event.deltaX,
56+
"deltaY": event.deltaY,
57+
"deltaZ": event.deltaZ,
58+
"deltaMode": event.deltaMode,
59+
"target": event.target.id
60+
});
61+
appendMessage(event.type + " " +
62+
"button: " + event.button + ", " +
63+
"pageX: " + event.pageX + ", " +
64+
"pageY: " + event.pageY + ", " +
65+
"button: " + event.button + ", " +
66+
"buttons: " + event.buttons + ", " +
67+
"deltaX: " + event.deltaX + ", " +
68+
"deltaY: " + event.deltaY + ", " +
69+
"deltaZ: " + event.deltaZ + ", " +
70+
"deltaMode: " + event.deltaMode + ", " +
71+
"target id: " + event.target.id);
72+
}
73+
74+
function resetEvents() {
75+
allEvents.events.length = 0;
76+
displayMessage("");
77+
}
78+
79+
document.addEventListener("DOMContentLoaded", function () {
80+
var outer = document.getElementById("outer");
81+
outer.addEventListener("wheel", recordWheelEvent);
82+
83+
var scrollable = document.getElementById("scrollable");
84+
scrollable.addEventListener("wheel", recordWheelEvent);
85+
});
86+
</script>
87+
</head>
88+
89+
<body>
90+
<div>
91+
<h2>ScrollReporter</h2>
92+
<div id="outer" class="area">
93+
</div>
94+
</div>
95+
<div>
96+
<h2>OverflowScrollReporter</h2>
97+
<div id="scrollable">
98+
<div id="scrollContent"></div>
99+
</div>
100+
</div>
101+
<div>
102+
<h2>IframeScrollReporter</h2>
103+
<iframe id='subframe' srcdoc='
104+
<script>
105+
document.scrollingElement.addEventListener("wheel",
106+
function(event) {
107+
window.parent.allEvents.events.push({
108+
"type": event.type,
109+
"button": event.button,
110+
"buttons": event.buttons,
111+
"deltaX": event.deltaX,
112+
"deltaY": event.deltaY,
113+
"deltaZ": event.deltaZ,
114+
"deltaMode": event.deltaMode,
115+
"target": event.target.id
116+
});
117+
}
118+
);
119+
</script>
120+
<div id="iframeContent"
121+
style="width: 7500px; height: 7500px; background-color:blue" ></div>'>
122+
</iframe>
123+
</div>
124+
<div id="resultContainer">
125+
<h2>Events</h2>
126+
<div id="events"></div>
127+
</div>
128+
</body>
129+
130+
</html>

‎java/maven_deps.bzl‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
22
load("@rules_jvm_external//:specs.bzl", "maven")
33

44
def selenium_java_deps():
5-
netty_version = "4.1.69.Final"
6-
opentelemetry_version = "1.9.0"
5+
netty_version = "4.1.70.Final"
6+
opentelemetry_version = "1.9.1"
77

88
maven_install(
99
artifacts = [
@@ -22,7 +22,7 @@ def selenium_java_deps():
2222
"com.google.auto:auto-common:1.2.1",
2323
"com.google.auto.service:auto-service:1.0.1",
2424
"com.google.auto.service:auto-service-annotations:1.0.1",
25-
"com.graphql-java:graphql-java:17.0",
25+
"com.graphql-java:graphql-java:230521-nf-execution",
2626
"io.grpc:grpc-context:1.42.1",
2727
"io.lettuce:lettuce-core:6.1.5.RELEASE",
2828
"io.netty:netty-buffer:%s" % netty_version,
@@ -33,10 +33,8 @@ def selenium_java_deps():
3333
"io.netty:netty-handler:%s" % netty_version,
3434
"io.netty:netty-handler-proxy:%s" % netty_version,
3535
"io.netty:netty-transport:%s" % netty_version,
36-
"io.netty:netty-transport-native-epoll:%s" % netty_version,
37-
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:%s" % netty_version,
38-
"io.netty:netty-transport-native-kqueue:%s" % netty_version,
39-
"io.netty:netty-transport-native-kqueue:jar:osx-x86_64:%s" % netty_version,
36+
"io.netty:netty-transport-classes-epoll:%s" % netty_version,
37+
"io.netty:netty-transport-classes-kqueue:%s" % netty_version,
4038
"io.netty:netty-transport-native-unix-common:%s" % netty_version,
4139
"io.opentelemetry:opentelemetry-api:%s" % opentelemetry_version,
4240
"io.opentelemetry:opentelemetry-context:%s" % opentelemetry_version,
@@ -61,7 +59,7 @@ def selenium_java_deps():
6159
"org.hamcrest:hamcrest-library",
6260
],
6361
),
64-
"net.bytebuddy:byte-buddy:1.12.1",
62+
"net.bytebuddy:byte-buddy:1.12.2",
6563
"net.jodah:failsafe:2.4.4",
6664
"net.sourceforge.htmlunit:htmlunit-core-js:2.55.0",
6765
"org.apache.commons:commons-exec:1.3",
@@ -70,9 +68,9 @@ def selenium_java_deps():
7068
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
7169
"org.hamcrest:hamcrest:2.2",
7270
"org.hsqldb:hsqldb:2.6.1",
73-
"org.mockito:mockito-core:4.0.0",
74-
"org.slf4j:slf4j-api:1.7.32",
75-
"org.slf4j:slf4j-jdk14:1.7.32",
71+
"org.mockito:mockito-core:4.1.0",
72+
"org.slf4j:slf4j-api:2.0.0-alpha5",
73+
"org.slf4j:slf4j-jdk14:2.0.0-alpha5",
7674
"org.testng:testng:7.4.0",
7775
"org.zeromq:jeromq:0.5.2",
7876
"xyz.rogfam:littleproxy:2.0.5",

0 commit comments

Comments
 (0)