Skip to content

Commit b24f9e7

Browse files
authored
Merge branch 'trunk' into case-insensitive-hrader-name
2 parents 98af5d8 + e4d3db3 commit b24f9e7

File tree

32 files changed

+1136
-681
lines changed

32 files changed

+1136
-681
lines changed

.github/workflows/stage-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66

77
env:
88
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9+
BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
910

1011
jobs:
1112
github-release:
@@ -20,7 +21,6 @@ jobs:
2021
- name: Extract version from branch name
2122
id: extract_version
2223
run: |
23-
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
2424
VERSION=$(echo $BRANCH_NAME | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
2525
echo "VERSION=$VERSION" >> $GITHUB_ENV
2626
- name: Prep git

.skipped-tests

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
-//javascript/atoms:test-chrome
2020
-//javascript/atoms:test-edge
2121
-//javascript/atoms:test-firefox-beta
22+
-//javascript/chrome-driver/...
2223
-//javascript/node/selenium-webdriver:test-bidi-network-test.js-chrome
2324
-//javascript/node/selenium-webdriver:test-builder-test.js-chrome
2425
-//javascript/node/selenium-webdriver:test-builder-test.js-firefox
@@ -54,3 +55,4 @@
5455
-//rb/spec/integration/selenium/webdriver:element-chrome
5556
-//rb/spec/integration/selenium/webdriver:element-chrome-bidi
5657
-//rb/spec/integration/selenium/webdriver:element-chrome-remote
58+
-//rust/tests/...

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ maven.install(
210210
"org.bouncycastle:bcpkix-jdk18on:1.78.1",
211211
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
212212
"org.hsqldb:hsqldb:2.7.3",
213+
"org.jspecify:jspecify:1.0.0",
213214
"org.junit.jupiter:junit-jupiter-api:5.10.3",
214215
"org.junit.jupiter:junit-jupiter-engine:5.10.3",
215216
"org.junit.jupiter:junit-jupiter-params:5.10.3",

common/mirror/selenium

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,20 @@
2525
{
2626
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-java-4.23.0.zip"
2727
},
28+
{
29+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-java-4.23.1.zip"
30+
},
2831
{
2932
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-server-4.23.0.jar"
3033
},
3134
{
3235
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-server-4.23.0.zip"
36+
},
37+
{
38+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-server-4.23.1.jar"
39+
},
40+
{
41+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-server-4.23.1.zip"
3342
}
3443
]
3544
},

common/src/web/javascriptPage.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,10 @@ <h1>Type Stuff</h1>
279279
</div>
280280
</div>
281281

282+
<form id="aParentFormId">
283+
<input type="text" name="tagName">
284+
</form>
285+
282286
</body>
283287
</html>
284288

java/maven_install.json

Lines changed: 14 additions & 2 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": 966816920,
4-
"__RESOLVED_ARTIFACTS_HASH": -1502533934,
3+
"__INPUT_ARTIFACTS_HASH": -1798640815,
4+
"__RESOLVED_ARTIFACTS_HASH": 890286156,
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.27.0",
@@ -654,6 +654,13 @@
654654
},
655655
"version": "6.2.2"
656656
},
657+
"org.jspecify:jspecify": {
658+
"shasums": {
659+
"jar": "1fad6e6be7557781e4d33729d49ae1cdc8fdda6fe477bb0cc68ce351eafdfbab",
660+
"sources": "adf0898191d55937fb3192ba971826f4f294292c4a960740f3c27310e7b70296"
661+
},
662+
"version": "1.0.0"
663+
},
657664
"org.junit.jupiter:junit-jupiter-api": {
658665
"shasums": {
659666
"jar": "6efe6e01ca1ff79b7bf4c6f1eed0b29292e166c27eaf7b00ac981a14d4de61aa",
@@ -2620,6 +2627,9 @@
26202627
"jodd.typeconverter.impl",
26212628
"jodd.util"
26222629
],
2630+
"org.jspecify:jspecify": [
2631+
"org.jspecify.annotations"
2632+
],
26232633
"org.junit.jupiter:junit-jupiter-api": [
26242634
"org.junit.jupiter.api",
26252635
"org.junit.jupiter.api.condition",
@@ -3134,6 +3144,8 @@
31343144
"org.htmlunit:htmlunit-core-js:jar:sources",
31353145
"org.jodd:jodd-util",
31363146
"org.jodd:jodd-util:jar:sources",
3147+
"org.jspecify:jspecify",
3148+
"org.jspecify:jspecify:jar:sources",
31373149
"org.junit.jupiter:junit-jupiter-api",
31383150
"org.junit.jupiter:junit-jupiter-api:jar:sources",
31393151
"org.junit.jupiter:junit-jupiter-engine",

java/src/org/openqa/selenium/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//java:defs.bzl", "java_dist_zip", "java_export", "java_import", "javadoc")
1+
load("//java:defs.bzl", "artifact", "java_dist_zip", "java_export", "java_import", "javadoc")
22
load("//java:version.bzl", "SE_VERSION")
33
load("//java/src/org/openqa/selenium/devtools:versions.bzl", "CDP_DEPS")
44

@@ -32,8 +32,8 @@ java_export(
3232
pom_template = ":template-pom",
3333
visibility = ["//visibility:public"],
3434
deps = [
35-
# Nothing from third party
3635
":manifest",
36+
artifact("org.jspecify:jspecify"),
3737
],
3838
)
3939

java/src/org/openqa/selenium/JavascriptExecutor.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.Collections;
2121
import java.util.Set;
2222
import java.util.stream.Collectors;
23+
import org.jspecify.annotations.NullMarked;
24+
import org.jspecify.annotations.Nullable;
2325
import org.openqa.selenium.internal.Require;
2426

2527
/**
@@ -30,6 +32,7 @@
3032
* request or when trying to access another frame. Most times when troubleshooting failure it's best
3133
* to view the browser's console after executing the WebDriver request.
3234
*/
35+
@NullMarked
3336
public interface JavascriptExecutor {
3437
/**
3538
* Executes JavaScript in the context of the currently selected frame or window. The script
@@ -63,7 +66,7 @@ public interface JavascriptExecutor {
6366
* @param args The arguments to the script. May be empty
6467
* @return One of Boolean, Long, Double, String, List, Map or WebElement. Or null.
6568
*/
66-
Object executeScript(String script, Object... args);
69+
@Nullable Object executeScript(String script, @Nullable Object... args);
6770

6871
/**
6972
* Execute an asynchronous piece of JavaScript in the context of the currently selected frame or
@@ -139,7 +142,7 @@ public interface JavascriptExecutor {
139142
* @return One of Boolean, Long, String, List, Map, WebElement, or null.
140143
* @see WebDriver.Timeouts#scriptTimeout(java.time.Duration)
141144
*/
142-
Object executeAsyncScript(String script, Object... args);
145+
@Nullable Object executeAsyncScript(String script, @Nullable Object... args);
143146

144147
/**
145148
* Commonly used scripts may be "pinned" to the WebDriver session, allowing them to be called
@@ -186,7 +189,7 @@ default Set<ScriptKey> getPinnedScripts() {
186189
*
187190
* @see #executeScript(String, Object...)
188191
*/
189-
default Object executeScript(ScriptKey key, Object... args) {
192+
default @Nullable Object executeScript(ScriptKey key, @Nullable Object... args) {
190193
Require.stateCondition(
191194
key instanceof UnpinnedScriptKey, "Script key should have been generated by this driver");
192195

java/src/org/openqa/selenium/OutputType.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@
2222
import java.nio.file.Files;
2323
import java.nio.file.Path;
2424
import java.util.Base64;
25+
import org.jspecify.annotations.NullMarked;
2526

2627
/**
2728
* Defines the output type for a screenshot.
2829
*
2930
* @see TakesScreenshot
3031
* @param <T> Type for the screenshot output.
3132
*/
33+
@NullMarked
3234
public interface OutputType<T> {
3335
/** Obtain the screenshot as base64 data. */
3436
OutputType<String> BASE64 =

java/src/org/openqa/selenium/SearchContext.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
package org.openqa.selenium;
1919

2020
import java.util.List;
21+
import org.jspecify.annotations.NullMarked;
2122

23+
@NullMarked
2224
public interface SearchContext {
2325
/**
2426
* Find all elements within the current context using the given mechanism.

0 commit comments

Comments
 (0)