Skip to content

Commit 6e12a2d

Browse files
Delta456Delta456
authored
Merge branch 'trunk' into py_log_level
2 parents f513b26 + f8d3c5d commit 6e12a2d

File tree

22 files changed

+173
-338
lines changed

22 files changed

+173
-338
lines changed

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ Issues are labelled to make them easier to categorise and find by:
350350
## Communication
351351

352352
Selenium contributors frequent the `#selenium` channel on
353-
[`irc.freenode.org`](https://webchat.freenode.net/). You can also join
353+
[`libera.chat`](https://web.libera.chat/). You can also join
354354
the [`selenium-developers@` mailing list](https://groups.google.com/forum/#!forum/selenium-developers).
355355
Check https://selenium.dev/support/ for a complete list of options to communicate.
356356

‎common/repositories.bzl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -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.0b4/linux-x86_64/en-US/firefox-139.0b4.tar.xz",
54-
sha256 = "21bfb99fe445e64ad8fb86822fd6d77c9c0d387530b787f3c3fc99b97723d664",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b5/linux-x86_64/en-US/firefox-139.0b5.tar.xz",
54+
sha256 = "5ff7ed52bf658b78b80595629096f12a16951ebb702da9a0dce9b02b14421976",
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.0b4/mac/en-US/Firefox%20139.0b4.dmg",
76-
sha256 = "c61d0fe161c6cb778a3e564f4cffa70cc7fb6bb5770586fa66c7db8ab9c31cf1",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b5/mac/en-US/Firefox%20139.0b5.dmg",
76+
sha256 = "c0c4cb22c32298f4d3199162326937a13700a9330b8f9840bf21ada5fcc41638",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
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.49/linux64/chrome-linux64.zip",
203-
sha256 = "cceec137ebf1d66cdee7966c05311cc7f200a0172d012925763c151bdca90edd",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.92/linux64/chrome-linux64.zip",
203+
sha256 = "c98775f3f17ad7368e6c08b3254f8345a90179fb10321c980e8a6e7426b6761f",
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.49/mac-x64/chrome-mac-x64.zip",
225-
sha256 = "461b547a323784a1ac315fbf387dcbe777199d809c54ea8a0f635010538aaa76",
224+
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.92/mac-x64/chrome-mac-x64.zip",
225+
sha256 = "eb2b36e4d07f7918766de16dca515b9dd122c74a27af91adf9443fdd20bf7c15",
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.49/linux64/chromedriver-linux64.zip",
247-
sha256 = "d9b388d8dc609f89332662a824899a0ed702a26c8dfd824e9a24a4e5fa44a197",
246+
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.92/linux64/chromedriver-linux64.zip",
247+
sha256 = "69be66bd096f895227928e14b964dbbca57ca2eeed111ea8601e43b3ca31c382",
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.49/mac-x64/chromedriver-mac-x64.zip",
265-
sha256 = "ba9ce908dc76c0ae6a3ac9976a0f820247e48fca2b0c9a183dfed901ed16f157",
264+
url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.92/mac-x64/chromedriver-mac-x64.zip",
265+
sha256 = "3c8ef934f9a37f23081f24fc4354ea37ad08202cc3cca157380bf6524c5bc6ec",
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/internal/Require.java‎

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.openqa.selenium.internal;
1919

20-
import java.io.File;
2120
import java.nio.file.Files;
2221
import java.nio.file.Path;
2322
import java.time.Duration;
@@ -161,11 +160,6 @@ public static IntChecker argument(String argName, @Nullable Integer number) {
161160
return new IntChecker(argName, number);
162161
}
163162

164-
@Deprecated(forRemoval = true)
165-
public static FileChecker argument(String argName, @Nullable File file) {
166-
return new FileChecker(argName, file);
167-
}
168-
169163
public static PathChecker argument(String argName, @Nullable Path path) {
170164
return new PathChecker(argName, path);
171165
}
@@ -180,11 +174,6 @@ public static <T> StateChecker<T> state(String name, @Nullable T state) {
180174
return new StateChecker<>(name, state);
181175
}
182176

183-
@Deprecated(forRemoval = true)
184-
public static FileStateChecker state(String name, @Nullable File file) {
185-
return new FileStateChecker(name, file);
186-
}
187-
188177
public static PathStateChecker state(String name, @Nullable Path path) {
189178
return new PathStateChecker(name, path);
190179
}
@@ -255,48 +244,6 @@ public int greaterThan(int max, String message) {
255244
}
256245
}
257246

258-
@Deprecated(forRemoval = true)
259-
public static class FileChecker {
260-
261-
private final String argName;
262-
private final @Nullable File file;
263-
264-
FileChecker(String argName, @Nullable File file) {
265-
this.argName = argName;
266-
this.file = file;
267-
}
268-
269-
public File isFile() {
270-
if (file == null) {
271-
throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
272-
}
273-
if (!file.exists()) {
274-
throw new IllegalArgumentException(
275-
String.format(MUST_EXIST, argName, file.getAbsolutePath()));
276-
}
277-
if (!file.isFile()) {
278-
throw new IllegalArgumentException(
279-
String.format(MUST_BE_FILE, argName, file.getAbsolutePath()));
280-
}
281-
return file;
282-
}
283-
284-
public File isDirectory() {
285-
if (file == null) {
286-
throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
287-
}
288-
if (!file.exists()) {
289-
throw new IllegalArgumentException(
290-
String.format(MUST_EXIST, argName, file.getAbsolutePath()));
291-
}
292-
if (!file.isDirectory()) {
293-
throw new IllegalArgumentException(
294-
String.format(MUST_BE_DIR, argName, file.getAbsolutePath()));
295-
}
296-
return file;
297-
}
298-
}
299-
300247
public static class PathChecker {
301248

302249
private final String argName;
@@ -373,58 +320,6 @@ public T instanceOf(Class<?> cls) {
373320
}
374321
}
375322

376-
@Deprecated(forRemoval = true)
377-
public static class FileStateChecker {
378-
379-
private final String name;
380-
private final @Nullable File file;
381-
382-
FileStateChecker(String name, @Nullable File file) {
383-
this.name = name;
384-
this.file = file;
385-
}
386-
387-
public File isFile() {
388-
if (file == null) {
389-
throw new IllegalStateException(String.format(MUST_BE_SET, name));
390-
}
391-
if (!file.exists()) {
392-
throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
393-
}
394-
if (!file.isFile()) {
395-
throw new IllegalStateException(String.format(MUST_BE_FILE, name, file.getAbsolutePath()));
396-
}
397-
return file;
398-
}
399-
400-
public File isDirectory() {
401-
if (file == null) {
402-
throw new IllegalStateException(String.format(MUST_BE_SET, name));
403-
}
404-
if (!file.exists()) {
405-
throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
406-
}
407-
if (!file.isDirectory()) {
408-
throw new IllegalStateException(String.format(MUST_BE_DIR, name, file.getAbsolutePath()));
409-
}
410-
return file;
411-
}
412-
413-
public File isExecutable() {
414-
if (file == null) {
415-
throw new IllegalStateException(String.format(MUST_BE_SET, name));
416-
}
417-
if (!file.exists()) {
418-
throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
419-
}
420-
if (!file.canExecute()) {
421-
throw new IllegalStateException(
422-
String.format(MUST_BE_EXECUTABLE, name, file.getAbsolutePath()));
423-
}
424-
return file;
425-
}
426-
}
427-
428323
public static class PathStateChecker {
429324

430325
private final String name;

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

Lines changed: 0 additions & 88 deletions
This file was deleted.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,4 @@ public ScreenshotException(Throwable cause) {
3232
public ScreenshotException(String message, Throwable cause) {
3333
super(message, cause);
3434
}
35-
36-
@Deprecated(forRemoval = true)
37-
public String getBase64EncodedScreenshot() {
38-
return null;
39-
}
4035
}

‎javascript/selenium-webdriver/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ script provided with `selenium-webdriver`.
116116
API documentation is available online from the [Selenium project][api].
117117
Additional resources include
118118

119-
- the #selenium channel on freenode IRC
119+
- the #selenium channel on Libera IRC
120120
- the [[email protected]][users] list
121121
- [SeleniumHQ](https://selenium.dev/documentation/) documentation
122122

‎py/selenium/webdriver/remote/webelement.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@ def __init__(self, parent, id_) -> None:
7777
self._id = id_
7878

7979
def __repr__(self):
80-
return f'<{type(self).__module__}.{type(self).__name__} (session="{self._parent.session_id}", element="{self._id}")>'
80+
return f'<{type(self).__module__}.{type(self).__name__} (session="{self.session_id}", element="{self._id}")>'
81+
82+
@property
83+
def session_id(self) -> str:
84+
return self._parent.session_id
8185

8286
@property
8387
def tag_name(self) -> str:

‎py/selenium/webdriver/support/wait.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ def __init__(
8181
# avoid the divide by zero
8282
if self._poll == 0:
8383
self._poll = POLL_FREQUENCY
84-
exceptions = list(IGNORED_EXCEPTIONS)
84+
exceptions: list = list(IGNORED_EXCEPTIONS)
8585
if ignored_exceptions:
8686
try:
8787
exceptions.extend(iter(ignored_exceptions))
8888
except TypeError: # ignored_exceptions is not iterable
8989
exceptions.append(ignored_exceptions)
9090
self._ignored_exceptions = tuple(exceptions)
9191

92-
def __repr__(self):
92+
def __repr__(self) -> str:
9393
return f'<{type(self).__module__}.{type(self).__name__} (session="{self._driver.session_id}")>'
9494

9595
def until(self, method: Callable[[D], Union[Literal[False], T]], message: str = "") -> T:

‎py/test/selenium/webdriver/marionette/conftest.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
@pytest.fixture
2525
def options():
2626
options = FirefoxOptions()
27+
options.add_argument("-remote-allow-system-access")
2728
return options
2829

2930

‎rb/spec/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ rb_library(
2222
"//rb/spec/integration/selenium/webdriver:driver",
2323
"//rb/spec/integration/selenium/webdriver:element",
2424
"//rb/spec/integration/selenium/webdriver:error",
25-
"//rb/spec/integration/selenium/webdriver:guard",
2625
"//rb/spec/integration/selenium/webdriver:listener",
2726
"//rb/spec/integration/selenium/webdriver:manager",
2827
"//rb/spec/integration/selenium/webdriver:navigation",
@@ -34,7 +33,6 @@ rb_library(
3433
"//rb/spec/integration/selenium/webdriver:timeout",
3534
"//rb/spec/integration/selenium/webdriver:virtual_authenticator",
3635
"//rb/spec/integration/selenium/webdriver:window",
37-
"//rb/spec/integration/selenium/webdriver:zipper",
3836
"//rb/spec/integration/selenium/webdriver/bidi:browsing_context",
3937
"//rb/spec/integration/selenium/webdriver/bidi:log_inspector",
4038
"//rb/spec/integration/selenium/webdriver/bidi:network",

0 commit comments

Comments
 (0)