Skip to content

Commit 07cfb9b

Browse files
cgoldbergcgoldberg
authored
Merge branch 'trunk' into refactor
2 parents 1de579a + 638621f commit 07cfb9b

File tree

7 files changed

+54
-141
lines changed

7 files changed

+54
-141
lines changed

‎MODULE.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ bazel_dep(name = "apple_rules_lint", version = "0.4.0")
44
bazel_dep(name = "aspect_rules_lint", version = "1.4.2")
55
bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
66
bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
7-
bazel_dep(name = "aspect_rules_js", version = "2.1.3")
8-
bazel_dep(name = "aspect_rules_ts", version = "3.4.0")
7+
bazel_dep(name = "aspect_rules_js", version = "2.3.7")
8+
bazel_dep(name = "aspect_rules_ts", version = "3.6.0")
99
bazel_dep(name = "bazel_features", version = "1.23.0")
1010
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1111
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")

‎common/repositories.bzl‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ def pin_browsers():
1111

1212
http_archive(
1313
name = "linux_firefox",
14-
url = "https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-x86_64/en-US/firefox-138.0.1.tar.xz",
15-
sha256 = "943abbbae0df188771bb58125a8aaada68bac5a37641629b305619abc4bd9756",
14+
url = "https://ftp.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/en-US/firefox-138.0.4.tar.xz",
15+
sha256 = "c27d5bf7483eda49aae544d9f8b4f064dbc7341b27d7098378108e52071bf947",
1616
build_file_content = """
1717
load("@aspect_rules_js//js:defs.bzl", "js_library")
1818
package(default_visibility = ["//visibility:public"])
@@ -33,8 +33,8 @@ js_library(
3333

3434
dmg_archive(
3535
name = "mac_firefox",
36-
url = "https://ftp.mozilla.org/pub/firefox/releases/138.0.1/mac/en-US/Firefox%20138.0.1.dmg",
37-
sha256 = "c4d9860f38683ba182d34c7a2b3b8157ec3e76498e0863d3ddab0c1a73360fb0",
36+
url = "https://ftp.mozilla.org/pub/firefox/releases/138.0.4/mac/en-US/Firefox%20138.0.4.dmg",
37+
sha256 = "6842663f38b8b12b08b67239f0cc2118e93fa0b5b57e856c21f384fb501fb430",
3838
build_file_content = """
3939
load("@aspect_rules_js//js:defs.bzl", "js_library")
4040
package(default_visibility = ["//visibility:public"])
@@ -50,8 +50,8 @@ js_library(
5050

5151
http_archive(
5252
name = "linux_beta_firefox",
53-
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b7/linux-x86_64/en-US/firefox-139.0b7.tar.xz",
54-
sha256 = "49af55e7290c14261aa1356edaca81def40e5ec7557c5973454964b145f6ffa3",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b10/linux-x86_64/en-US/firefox-139.0b10.tar.xz",
54+
sha256 = "c369df6474ffdece0eff47e8750d52ed7663bf1ecee88d9a19f70b3e2b206cf8",
5555
build_file_content = """
5656
load("@aspect_rules_js//js:defs.bzl", "js_library")
5757
package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
7272

7373
dmg_archive(
7474
name = "mac_beta_firefox",
75-
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b7/mac/en-US/Firefox%20139.0b7.dmg",
76-
sha256 = "8aa485c0133aa2281c727ccd42d162ba70239d1bd7389ada145018f8a7b58c76",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b10/mac/en-US/Firefox%20139.0b10.dmg",
76+
sha256 = "48bc5bf417013e457a6f3437271cbeee6bd67a0a8381bbd7deb198dc9caa3057",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
123123

124124
pkg_archive(
125125
name = "mac_edge",
126-
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/0d424762-5771-4a00-ada6-d1a3fb2e2054/MicrosoftEdge-136.0.3240.64.pkg",
127-
sha256 = "483324afe4db695c9497822e3e220065379d92077b8f29abb1e8d8f6d045909c",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/8b523c53-9ba6-4310-b0d3-9391eaf174f7/MicrosoftEdge-136.0.3240.76.pkg",
127+
sha256 = "6843377514a8ab215423998e039dcf95ec240300ed12e19f2244fd7bf77a68f1",
128128
move = {
129-
"MicrosoftEdge-136.0.3240.64.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-136.0.3240.76.pkg/Payload/Microsoft Edge.app": "Edge.app",
130130
},
131131
build_file_content = """
132132
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
143143

144144
deb_archive(
145145
name = "linux_edge",
146-
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_136.0.3240.64-1_amd64.deb",
147-
sha256 = "cf2a2ea4d76d5cae66bc8e68ca9f40255ad6c1894c28e55a6813a70ce8c73b4a",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_136.0.3240.76-1_amd64.deb",
147+
sha256 = "6e234cd5ec49ff151c9a16631fb65c145f5c615aac3dabdb6edb099d1565c85a",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.azureedge.net/136.0.3240.64/edgedriver_linux64.zip",
169-
sha256 = "0e9f65bb5fd87f80d0aca4d5330e0aab37057a8c233ba6bc46e5f43b9640103c",
168+
url = "https://msedgedriver.azureedge.net/136.0.3240.76/edgedriver_linux64.zip",
169+
sha256 = "dbab1e25a3dc1013a929be5626324ee3ac0575b747793da51d6b8de93f0f2ff2",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
172172
package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.azureedge.net/136.0.3240.64/edgedriver_mac64.zip",
186-
sha256 = "729731958bfeee999006572973c8eee6d4bd402e34c5b410fb29bfbaeeafb8bd",
185+
url = "https://msedgedriver.azureedge.net/136.0.3240.76/edgedriver_mac64.zip",
186+
sha256 = "d1cc5424b522227f0c0950ac501e52a55e0fb44ee2ebc8af3a83fc9222363e8f",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])
@@ -199,8 +199,8 @@ js_library(
199199

200200
http_archive(
201201
name = "linux_chrome",
202-
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.92/linux64/chrome-linux64.zip",
203-
sha256 = "c98775f3f17ad7368e6c08b3254f8345a90179fb10321c980e8a6e7426b6761f",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.94/linux64/chrome-linux64.zip",
203+
sha256 = "12a23e8a19f90eb785f568219ff1d04d3b30ea3c909d8499f26a76c8c3172c28",
204204
build_file_content = """
205205
load("@aspect_rules_js//js:defs.bzl", "js_library")
206206
package(default_visibility = ["//visibility:public"])
@@ -221,8 +221,8 @@ js_library(
221221

222222
http_archive(
223223
name = "mac_chrome",
224-
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.92/mac-x64/chrome-mac-x64.zip",
225-
sha256 = "eb2b36e4d07f7918766de16dca515b9dd122c74a27af91adf9443fdd20bf7c15",
224+
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.94/mac-x64/chrome-mac-x64.zip",
225+
sha256 = "e4152cf4ae75b28302707c588de5d907ed5cf5864cbf4cedc9b4bf40b66abbf1",
226226
strip_prefix = "chrome-mac-x64",
227227
patch_cmds = [
228228
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -243,8 +243,8 @@ js_library(
243243

244244
http_archive(
245245
name = "linux_chromedriver",
246-
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.92/linux64/chromedriver-linux64.zip",
247-
sha256 = "69be66bd096f895227928e14b964dbbca57ca2eeed111ea8601e43b3ca31c382",
246+
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.94/linux64/chromedriver-linux64.zip",
247+
sha256 = "308a83370d698ea7f7e3ae1f5b0dccc6c59408483d0c4d039c2f3befd5bed489",
248248
strip_prefix = "chromedriver-linux64",
249249
build_file_content = """
250250
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -261,8 +261,8 @@ js_library(
261261

262262
http_archive(
263263
name = "mac_chromedriver",
264-
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.92/mac-x64/chromedriver-mac-x64.zip",
265-
sha256 = "3c8ef934f9a37f23081f24fc4354ea37ad08202cc3cca157380bf6524c5bc6ec",
264+
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.94/mac-x64/chromedriver-mac-x64.zip",
265+
sha256 = "5870fe17dd2c5d8ffb942c56d57a518e8a94d358e19b61e74cadd2a196e5d370",
266266
strip_prefix = "chromedriver-mac-x64",
267267
build_file_content = """
268268
load("@aspect_rules_js//js:defs.bzl", "js_library")

‎java/src/org/openqa/selenium/WebDriver.java‎

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.time.Duration;
2222
import java.util.List;
2323
import java.util.Set;
24-
import java.util.concurrent.TimeUnit;
2524
import org.jspecify.annotations.NullMarked;
2625
import org.jspecify.annotations.Nullable;
2726
import org.openqa.selenium.logging.LoggingPreferences;
@@ -326,38 +325,6 @@ default Duration getImplicitWaitTimeout() {
326325
throw new UnsupportedCommandException();
327326
}
328327

329-
/**
330-
* @deprecated Use {@link #scriptTimeout(Duration)}
331-
* <p>Sets the amount of time to wait for an asynchronous script to finish execution before
332-
* throwing an error. If the timeout is negative, not null, or greater than 2e16 - 1, an
333-
* error code with invalid argument will be returned.
334-
* @param time The timeout value.
335-
* @param unit The unit of time.
336-
* @return A self reference.
337-
* @see JavascriptExecutor#executeAsyncScript(String, Object...)
338-
* @see <a href="https://www.w3.org/TR/webdriver/#set-timeouts">W3C WebDriver</a>
339-
* @see <a href="https://www.w3.org/TR/webdriver/#dfn-timeouts-configuration">W3C WebDriver</a>
340-
*/
341-
@Deprecated
342-
Timeouts setScriptTimeout(long time, TimeUnit unit);
343-
344-
/**
345-
* Sets the amount of time to wait for an asynchronous script to finish execution before
346-
* throwing an error. If the timeout is negative, not null, or greater than 2e16 - 1, an error
347-
* code with invalid argument will be returned.
348-
*
349-
* @param duration The timeout value.
350-
* @deprecated Use {@link #scriptTimeout(Duration)}
351-
* @return A self reference.
352-
* @see JavascriptExecutor#executeAsyncScript(String, Object...)
353-
* @see <a href="https://www.w3.org/TR/webdriver/#set-timeouts">W3C WebDriver</a>
354-
* @see <a href="https://www.w3.org/TR/webdriver/#dfn-timeouts-configuration">W3C WebDriver</a>
355-
*/
356-
@Deprecated
357-
default Timeouts setScriptTimeout(Duration duration) {
358-
return setScriptTimeout(duration.toMillis(), TimeUnit.MILLISECONDS);
359-
}
360-
361328
/**
362329
* Sets the amount of time to wait for an asynchronous script to finish execution before
363330
* throwing an error. If the timeout is negative, not null, or greater than 2e16 - 1, an error
@@ -369,9 +336,7 @@ default Timeouts setScriptTimeout(Duration duration) {
369336
* @see <a href="https://www.w3.org/TR/webdriver/#set-timeouts">W3C WebDriver</a>
370337
* @see <a href="https://www.w3.org/TR/webdriver/#dfn-timeouts-configuration">W3C WebDriver</a>
371338
*/
372-
default Timeouts scriptTimeout(Duration duration) {
373-
return setScriptTimeout(duration);
374-
}
339+
Timeouts scriptTimeout(Duration duration);
375340

376341
/**
377342
* Gets the amount of time to wait for an asynchronous script to finish execution before
@@ -386,20 +351,6 @@ default Duration getScriptTimeout() {
386351
throw new UnsupportedCommandException();
387352
}
388353

389-
/**
390-
* @param time The timeout value.
391-
* @param unit The unit of time.
392-
* @return A Timeouts interface.
393-
* @see <a href="https://www.w3.org/TR/webdriver/#set-timeouts">W3C WebDriver</a>
394-
* @see <a href="https://www.w3.org/TR/webdriver/#dfn-timeouts-configuration">W3C WebDriver</a>
395-
* @deprecated Use {@link #pageLoadTimeout(Duration)}
396-
* <p>Sets the amount of time to wait for a page load to complete before throwing an error.
397-
* If the timeout is negative, not null, or greater than 2e16 - 1, an error code with
398-
* invalid argument will be returned.
399-
*/
400-
@Deprecated
401-
Timeouts pageLoadTimeout(long time, TimeUnit unit);
402-
403354
/**
404355
* Sets the amount of time to wait for a page load to complete before throwing an error. If the
405356
* timeout is negative, not null, or greater than 2e16 - 1, an error code with invalid argument
@@ -410,9 +361,7 @@ default Duration getScriptTimeout() {
410361
* @see <a href="https://www.w3.org/TR/webdriver/#set-timeouts">W3C WebDriver</a>
411362
* @see <a href="https://www.w3.org/TR/webdriver/#dfn-timeouts-configuration">W3C WebDriver</a>
412363
*/
413-
default Timeouts pageLoadTimeout(Duration duration) {
414-
return pageLoadTimeout(duration.toMillis(), TimeUnit.MILLISECONDS);
415-
}
364+
Timeouts pageLoadTimeout(Duration duration);
416365

417366
/**
418367
* Gets the amount of time to wait for a page load to complete before throwing an error. If the

‎java/src/org/openqa/selenium/remote/DriverCommand.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Collection;
2525
import java.util.List;
2626
import java.util.Map;
27-
import java.util.concurrent.TimeUnit;
2827
import org.openqa.selenium.Capabilities;
2928
import org.openqa.selenium.Cookie;
3029
import org.openqa.selenium.Dimension;
@@ -341,32 +340,14 @@ static CommandPayload PRINT_PAGE(PrintOptions options) {
341340
return new CommandPayload(PRINT_PAGE, options.toMap());
342341
}
343342

344-
@Deprecated
345-
static CommandPayload SET_IMPLICIT_WAIT_TIMEOUT(long time, TimeUnit unit) {
346-
return new CommandPayload(
347-
SET_TIMEOUT, Map.of("implicit", TimeUnit.MILLISECONDS.convert(time, unit)));
348-
}
349-
350343
static CommandPayload SET_IMPLICIT_WAIT_TIMEOUT(Duration duration) {
351344
return new CommandPayload(SET_TIMEOUT, Map.of("implicit", duration.toMillis()));
352345
}
353346

354-
@Deprecated
355-
static CommandPayload SET_SCRIPT_TIMEOUT(long time, TimeUnit unit) {
356-
return new CommandPayload(
357-
SET_TIMEOUT, Map.of("script", TimeUnit.MILLISECONDS.convert(time, unit)));
358-
}
359-
360347
static CommandPayload SET_SCRIPT_TIMEOUT(Duration duration) {
361348
return new CommandPayload(SET_TIMEOUT, Map.of("script", duration.toMillis()));
362349
}
363350

364-
@Deprecated
365-
static CommandPayload SET_PAGE_LOAD_TIMEOUT(long time, TimeUnit unit) {
366-
return new CommandPayload(
367-
SET_TIMEOUT, Map.of("pageLoad", TimeUnit.MILLISECONDS.convert(time, unit)));
368-
}
369-
370351
static CommandPayload SET_PAGE_LOAD_TIMEOUT(Duration duration) {
371352
return new CommandPayload(SET_TIMEOUT, Map.of("pageLoad", duration.toMillis()));
372353
}
@@ -375,10 +356,6 @@ static CommandPayload ACTIONS(Collection<Sequence> actions) {
375356
return new CommandPayload(ACTIONS, Map.of("actions", actions));
376357
}
377358

378-
static CommandPayload IME_ACTIVATE_ENGINE(String engine) {
379-
return new CommandPayload(SET_ALERT_VALUE, Map.of("engine", engine));
380-
}
381-
382359
static CommandPayload SET_CURRENT_WINDOW_POSITION(Point targetPosition) {
383360
return new CommandPayload(
384361
SET_CURRENT_WINDOW_POSITION, Map.of("x", targetPosition.x, "y", targetPosition.y));

‎java/src/org/openqa/selenium/remote/RemoteWebDriver.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import java.util.List;
3838
import java.util.Map;
3939
import java.util.Set;
40-
import java.util.concurrent.TimeUnit;
4140
import java.util.function.BiFunction;
4241
import java.util.logging.Level;
4342
import java.util.logging.Logger;
@@ -969,18 +968,6 @@ public Duration getImplicitWaitTimeout() {
969968
return Duration.ofMillis(timeout);
970969
}
971970

972-
@Deprecated
973-
@Override
974-
public Timeouts setScriptTimeout(long time, TimeUnit unit) {
975-
return setScriptTimeout(Duration.ofMillis(unit.toMillis(time)));
976-
}
977-
978-
@Deprecated
979-
@Override
980-
public Timeouts setScriptTimeout(Duration duration) {
981-
return scriptTimeout(duration);
982-
}
983-
984971
@Override
985972
public Timeouts scriptTimeout(Duration duration) {
986973
execute(DriverCommand.SET_SCRIPT_TIMEOUT(duration));
@@ -995,12 +982,6 @@ public Duration getScriptTimeout() {
995982
return Duration.ofMillis(timeout);
996983
}
997984

998-
@Deprecated
999-
@Override
1000-
public Timeouts pageLoadTimeout(long time, TimeUnit unit) {
1001-
return pageLoadTimeout(Duration.ofMillis(unit.toMillis(time)));
1002-
}
1003-
1004985
@Override
1005986
public Timeouts pageLoadTimeout(Duration duration) {
1006987
execute(DriverCommand.SET_PAGE_LOAD_TIMEOUT(duration));

‎java/src/org/openqa/selenium/support/events/WebDriverListener.java‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,22 +909,44 @@ default void afterImplicitlyWait(WebDriver.Timeouts timeouts, Duration duration)
909909

910910
/**
911911
* This action will be performed each time before {@link
912-
* WebDriver.Timeouts#setScriptTimeout(Duration)} is called.
912+
* WebDriver.Timeouts#scriptTimeout(Duration)} is called.
913913
*
914914
* @param timeouts The timeouts object that will be called
915915
* @param duration The duration that will be passed to the method
916+
* @deprecated Use {@link #beforeScriptTimeout(WebDriver.Timeouts, Duration)} instead.
916917
*/
918+
@Deprecated
917919
default void beforeSetScriptTimeout(WebDriver.Timeouts timeouts, Duration duration) {}
918920

921+
/**
922+
* This action will be performed each time before {@link
923+
* WebDriver.Timeouts#scriptTimeout(Duration)} is called.
924+
*
925+
* @param timeouts The timeouts object that will be called
926+
* @param duration The duration that will be passed to the method
927+
*/
928+
default void beforeScriptTimeout(WebDriver.Timeouts timeouts, Duration duration) {}
929+
919930
/**
920931
* This action will be performed each time after {@link
921-
* WebDriver.Timeouts#setScriptTimeout(Duration)} is called.
932+
* WebDriver.Timeouts#scriptTimeout(Duration)} is called.
922933
*
923934
* @param timeouts The timeouts object that will be called
924935
* @param duration The duration that will be passed to the method
936+
* @deprecated Use {@link #afterScriptTimeout(WebDriver.Timeouts, Duration)} instead.
925937
*/
938+
@Deprecated
926939
default void afterSetScriptTimeout(WebDriver.Timeouts timeouts, Duration duration) {}
927940

941+
/**
942+
* This action will be performed each time after {@link
943+
* WebDriver.Timeouts#scriptTimeout(Duration)} is called.
944+
*
945+
* @param timeouts The timeouts object that will be called
946+
* @param duration The duration that will be passed to the method
947+
*/
948+
default void afterScriptTimeout(WebDriver.Timeouts timeouts, Duration duration) {}
949+
928950
/**
929951
* This action will be performed each time before {@link
930952
* WebDriver.Timeouts#pageLoadTimeout(Duration)} is called.

0 commit comments

Comments
 (0)