Skip to content

Commit

Permalink
Merge branch 'trunk' into add-execute-script-java
Browse files Browse the repository at this point in the history
  • Loading branch information
pujagani authored Aug 12, 2024
2 parents 057a7a9 + 596070d commit 9c61421
Show file tree
Hide file tree
Showing 62 changed files with 1,793 additions and 503 deletions.
2 changes: 2 additions & 0 deletions .skipped-tests
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
-//javascript/atoms:test-chrome
-//javascript/atoms:test-edge
-//javascript/atoms:test-firefox-beta
-//javascript/chrome-driver/...
-//javascript/node/selenium-webdriver:test-bidi-network-test.js-chrome
-//javascript/node/selenium-webdriver:test-builder-test.js-chrome
-//javascript/node/selenium-webdriver:test-builder-test.js-firefox
Expand Down Expand Up @@ -54,3 +55,4 @@
-//rb/spec/integration/selenium/webdriver:element-chrome
-//rb/spec/integration/selenium/webdriver:element-chrome-bidi
-//rb/spec/integration/selenium/webdriver:element-chrome-remote
-//rust/tests/...
12 changes: 8 additions & 4 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module(name = "selenium")

bazel_dep(name = "apple_rules_lint", version = "0.3.2")
bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")
bazel_dep(name = "aspect_bazel_lib", version = "2.7.9")
bazel_dep(name = "aspect_rules_esbuild", version = "0.20.1")
bazel_dep(name = "aspect_rules_js", version = "1.42.3")
bazel_dep(name = "aspect_rules_ts", version = "2.4.2")
Expand Down Expand Up @@ -41,7 +41,11 @@ linter.register(name = "rust-rustfmt")
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
node.toolchain(node_version = "20.9.0")

pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm", dev_dependency = True)
pnpm = use_extension(
"@aspect_rules_js//npm:extensions.bzl",
"pnpm",
dev_dependency = True,
)
use_repo(pnpm, "pnpm")

npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
Expand Down Expand Up @@ -206,6 +210,7 @@ maven.install(
"org.bouncycastle:bcpkix-jdk18on:1.78.1",
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
"org.hsqldb:hsqldb:2.7.3",
"org.jspecify:jspecify:1.0.0",
"org.junit.jupiter:junit-jupiter-api:5.10.3",
"org.junit.jupiter:junit-jupiter-engine:5.10.3",
"org.junit.jupiter:junit-jupiter-params:5.10.3",
Expand Down Expand Up @@ -347,8 +352,7 @@ use_repo(
"linux_beta_firefox",
"linux_chrome",
"linux_chromedriver",
# Commenting out `linux_edge` since this is not created, but it really should be.
#"linux_edge",
"linux_edge",
"linux_edgedriver",
"linux_firefox",
"linux_geckodriver",
Expand Down
4 changes: 4 additions & 0 deletions common/geckodriver/geckodriver-support.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"geckodriver-releases": [
{
"geckodriver-version": "0.35.0",
"min-firefox-version": 115
},
{
"geckodriver-version": "0.34.0",
"min-firefox-version": 115
Expand Down
15 changes: 12 additions & 3 deletions common/mirror/selenium
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"tag_name": "nightly",
"assets": [
{
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.23.0.zip"
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.24.0-SNAPSHOT.zip"
},
{
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.23.0.jar"
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.24.0-SNAPSHOT.jar"
},
{
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.23.0.zip"
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.24.0-SNAPSHOT.zip"
}
]
},
Expand All @@ -25,11 +25,20 @@
{
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-java-4.23.0.zip"
},
{
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-java-4.23.1.zip"
},
{
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-server-4.23.0.jar"
},
{
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-server-4.23.0.zip"
},
{
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-server-4.23.1.jar"
},
{
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.23.0/selenium-server-4.23.1.zip"
}
]
},
Expand Down
47 changes: 35 additions & 12 deletions common/repositories.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This file has been generated using `bazel run scripts:pinned_browsers`

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("//common/private:deb_archive.bzl", "deb_archive")
load("//common/private:dmg_archive.bzl", "dmg_archive")
load("//common/private:drivers.bzl", "local_drivers")
load("//common/private:pkg_archive.bzl", "pkg_archive")
Expand Down Expand Up @@ -140,10 +141,32 @@ js_library(
""",
)

deb_archive(
name = "linux_edge",
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_127.0.2651.74-1_amd64.deb",
sha256 = "5d7363177d366c0247a304c9dc9caa09158d7768a632736c8cf36b0278340328",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
filegroup(
name = "files",
srcs = glob(["**/*"]),
)
exports_files(["opt/microsoft/msedge/microsoft-edge"])
js_library(
name = "edge-js",
data = [":files"],
)
""",
)

http_archive(
name = "linux_edgedriver",
url = "https://msedgedriver.azureedge.net/127.0.2651.74/edgedriver_linux64.zip",
sha256 = "e6cb5d1a177cf4975efbf4b0868cc5de002d0e534611706c965008f78c28f5ae",
url = "https://msedgedriver.azureedge.net/127.0.2651.72/edgedriver_linux64.zip",
sha256 = "d549371e14bd6f3522d58ba88328cc411af86146b48f923fb9a9072569032103",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand All @@ -159,8 +182,8 @@ js_library(

http_archive(
name = "mac_edgedriver",
url = "https://msedgedriver.azureedge.net/127.0.2651.74/edgedriver_mac64.zip",
sha256 = "2ec351cb1d4d3838b1c0917a513d14282560cd90b7b376d665cf981546274525",
url = "https://msedgedriver.azureedge.net/127.0.2651.72/edgedriver_mac64.zip",
sha256 = "bf409629b5a0e741048bb825dfe41a2327e2a90640e06c755c4df65596a569f0",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand All @@ -176,8 +199,8 @@ js_library(

http_archive(
name = "linux_chrome",
url = "https://storage.googleapis.com/chrome-for-testing-public/127.0.6533.72/linux64/chrome-linux64.zip",
sha256 = "9ea898023336c4e5e0719fbe3cfc52caeaa93b1db51c8638178490b7a82e8146",
url = "https://storage.googleapis.com/chrome-for-testing-public/127.0.6533.88/linux64/chrome-linux64.zip",
sha256 = "20e2000334f8cefa115ad3e2c55d6ad0e3e254be33a5fd0b9178c3d1a9c78ba9",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand All @@ -198,8 +221,8 @@ js_library(

http_archive(
name = "mac_chrome",
url = "https://storage.googleapis.com/chrome-for-testing-public/127.0.6533.72/mac-x64/chrome-mac-x64.zip",
sha256 = "40d4c456d221e762859e82c1b5844fbfe86aedb2818d75f6094967382fbe72e7",
url = "https://storage.googleapis.com/chrome-for-testing-public/127.0.6533.88/mac-x64/chrome-mac-x64.zip",
sha256 = "91a010d846597e068f63b0d6ebb56f6a242ced697bc2b8375e22a24fc668582a",
strip_prefix = "chrome-mac-x64",
patch_cmds = [
"mv 'Google Chrome for Testing.app' Chrome.app",
Expand All @@ -220,8 +243,8 @@ js_library(

http_archive(
name = "linux_chromedriver",
url = "https://storage.googleapis.com/chrome-for-testing-public/127.0.6533.72/linux64/chromedriver-linux64.zip",
sha256 = "a7971098c76d7bb4df4cfa2183eae922ccb2624d4e29235bd01c1a316987b82a",
url = "https://storage.googleapis.com/chrome-for-testing-public/127.0.6533.88/linux64/chromedriver-linux64.zip",
sha256 = "d603382aacda709d775f9366067da15ba2ff6bbccddb5ad264193a6b42230a8c",
strip_prefix = "chromedriver-linux64",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
Expand All @@ -238,8 +261,8 @@ js_library(

http_archive(
name = "mac_chromedriver",
url = "https://storage.googleapis.com/chrome-for-testing-public/127.0.6533.72/mac-x64/chromedriver-mac-x64.zip",
sha256 = "73f94c90e7685bfb57e7ba2997fc1e24687f8b251e4d31795de8ecec8a40f908",
url = "https://storage.googleapis.com/chrome-for-testing-public/127.0.6533.88/mac-x64/chromedriver-mac-x64.zip",
sha256 = "056f37a603c988ac5d4352b8fbc28c0c606abd1f89de2fbc01998a7e76129969",
strip_prefix = "chromedriver-mac-x64",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
Expand Down
2 changes: 1 addition & 1 deletion dotnet/selenium-dotnet-version.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BUILD FILE SYNTAX: STARLARK

SE_VERSION = "4.23.0"
SE_VERSION = "4.24.0-nightly202407312116"
ASSEMBLY_VERSION = "4.0.0.0"
SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0"]

Expand Down
8 changes: 4 additions & 4 deletions dotnet/test/support/Events/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ dotnet_nunit_test_suite(
name = "SmallTests",
size = "small",
srcs = SMALL_TESTS,
target_frameworks = ["net7.0"],
target_frameworks = ["net8.0"],
deps = [
"//dotnet/src/support",
"//dotnet/src/webdriver",
"//dotnet/src/webdriver:webdriver-net8.0",
"//dotnet/test/common:fixtures",
framework("nuget", "NUnit"),
framework("nuget", "Moq"),
Expand All @@ -36,10 +36,10 @@ dotnet_nunit_test_suite(
data = [
"//dotnet/test/common:test-data",
],
target_frameworks = ["net7.0"],
target_frameworks = ["net8.0"],
deps = [
"//dotnet/src/support",
"//dotnet/src/webdriver",
"//dotnet/src/webdriver:webdriver-net8.0",
"//dotnet/test/common:fixtures",
framework("nuget", "NUnit"),
],
Expand Down
4 changes: 2 additions & 2 deletions dotnet/test/support/Extensions/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ dotnet_nunit_test_suite(
name = "SmallTests",
size = "small",
srcs = glob(["*.cs"]),
target_frameworks = ["net7.0"],
target_frameworks = ["net8.0"],
deps = [
"//dotnet/src/support",
"//dotnet/src/webdriver",
"//dotnet/src/webdriver:webdriver-net8.0",
"//dotnet/test/common:fixtures",
framework("nuget", "Moq"),
framework("nuget", "NUnit"),
Expand Down
8 changes: 4 additions & 4 deletions dotnet/test/support/UI/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ dotnet_nunit_test_suite(
name = "SmallTests",
size = "small",
srcs = SMALL_TESTS,
target_frameworks = ["net7.0"],
target_frameworks = ["net8.0"],
deps = [
"//dotnet/src/support",
"//dotnet/src/webdriver",
"//dotnet/src/webdriver:webdriver-net8.0",
"//dotnet/test/common:fixtures",
framework("nuget", "NUnit"),
framework("nuget", "Moq"),
Expand All @@ -41,10 +41,10 @@ dotnet_nunit_test_suite(
data = [
"//dotnet/test/common:test-data",
],
target_frameworks = ["net7.0"],
target_frameworks = ["net8.0"],
deps = [
"//dotnet/src/support",
"//dotnet/src/webdriver",
"//dotnet/src/webdriver:webdriver-net8.0",
"//dotnet/test/common:fixtures",
framework("nuget", "NUnit"),
],
Expand Down
14 changes: 14 additions & 0 deletions java/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
v4.23.1
======
* [bidi] Add dom mutation handler support (#14304)
* [grid] Exclude status DRAINING when distributor getting available nodes (#14282)
* [bidi] Add script pinning methods (#14305)
* Allow setting JDKHttpClient connectionTimeout, readTimeout, version via system property (#14306)
* remove package org.openqa.selenium.grid.session.remote (#14295)
* close the HttClient in case starting the session fails
* Adding system property to disable tracing `webdriver.remote.enableTracing`
* wait for the close response #14280
* [bidi] Add authentication handlers (#14334)
* [grid] ensure the local_sessionmap.remove event is raised (#14337)
* [bidi] Add filter auth handler (#14349)

v4.23.0
======
* Use Files.notExists to check files #14088
Expand Down
16 changes: 14 additions & 2 deletions java/maven_install.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": 966816920,
"__RESOLVED_ARTIFACTS_HASH": -1502533934,
"__INPUT_ARTIFACTS_HASH": -1798640815,
"__RESOLVED_ARTIFACTS_HASH": 890286156,
"conflict_resolution": {
"com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
"com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.27.0",
Expand Down Expand Up @@ -654,6 +654,13 @@
},
"version": "6.2.2"
},
"org.jspecify:jspecify": {
"shasums": {
"jar": "1fad6e6be7557781e4d33729d49ae1cdc8fdda6fe477bb0cc68ce351eafdfbab",
"sources": "adf0898191d55937fb3192ba971826f4f294292c4a960740f3c27310e7b70296"
},
"version": "1.0.0"
},
"org.junit.jupiter:junit-jupiter-api": {
"shasums": {
"jar": "6efe6e01ca1ff79b7bf4c6f1eed0b29292e166c27eaf7b00ac981a14d4de61aa",
Expand Down Expand Up @@ -2620,6 +2627,9 @@
"jodd.typeconverter.impl",
"jodd.util"
],
"org.jspecify:jspecify": [
"org.jspecify.annotations"
],
"org.junit.jupiter:junit-jupiter-api": [
"org.junit.jupiter.api",
"org.junit.jupiter.api.condition",
Expand Down Expand Up @@ -3134,6 +3144,8 @@
"org.htmlunit:htmlunit-core-js:jar:sources",
"org.jodd:jodd-util",
"org.jodd:jodd-util:jar:sources",
"org.jspecify:jspecify",
"org.jspecify:jspecify:jar:sources",
"org.junit.jupiter:junit-jupiter-api",
"org.junit.jupiter:junit-jupiter-api:jar:sources",
"org.junit.jupiter:junit-jupiter-engine",
Expand Down
4 changes: 2 additions & 2 deletions java/src/org/openqa/selenium/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//java:defs.bzl", "java_dist_zip", "java_export", "java_import", "javadoc")
load("//java:defs.bzl", "artifact", "java_dist_zip", "java_export", "java_import", "javadoc")
load("//java:version.bzl", "SE_VERSION")
load("//java/src/org/openqa/selenium/devtools:versions.bzl", "CDP_DEPS")

Expand Down Expand Up @@ -32,8 +32,8 @@ java_export(
pom_template = ":template-pom",
visibility = ["//visibility:public"],
deps = [
# Nothing from third party
":manifest",
artifact("org.jspecify:jspecify"),
],
)

Expand Down
2 changes: 2 additions & 0 deletions java/src/org/openqa/selenium/SearchContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
package org.openqa.selenium;

import java.util.List;
import org.jspecify.annotations.NullMarked;

@NullMarked
public interface SearchContext {
/**
* Find all elements within the current context using the given mechanism.
Expand Down
Loading

0 comments on commit 9c61421

Please sign in to comment.