Merge branch 'trunk' into use_rbs_trace

Author: aguspe

CONTRIBUTING.md

@@ -350,7 +350,7 @@ Issues are labelled to make them easier to categorise and find by:
 ## Communication
 
 Selenium contributors frequent the `#selenium` channel on
-[`irc.freenode.org`](https://webchat.freenode.net/). You can also join
+[`libera.chat`](https://web.libera.chat/). You can also join
 the [`selenium-developers@` mailing list](https://groups.google.com/forum/#!forum/selenium-developers).
 Check https://selenium.dev/support/ for a complete list of options to communicate.
 

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b3/linux-x86_64/en-US/firefox-139.0b3.tar.xz",
-        sha256 = "8db541819ed4c06678e1678715c0d3f2cc43fba21c593dfc6a5f10c7674e98af",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/en-US/firefox-139.0b4.tar.xz",
+        sha256 = "21bfb99fe445e64ad8fb86822fd6d77c9c0d387530b787f3c3fc99b97723d664",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b3/mac/en-US/Firefox%20139.0b3.dmg",
-        sha256 = "a7433bb645cbef9dd123afe8856060dbf6afaa1bab06d14298ebbc7d35968984",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b4/mac/en-US/Firefox%20139.0b4.dmg",
+        sha256 = "c61d0fe161c6cb778a3e564f4cffa70cc7fb6bb5770586fa66c7db8ab9c31cf1",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

java/src/org/openqa/selenium/internal/Require.java

@@ -17,7 +17,6 @@
 
 package org.openqa.selenium.internal;
 
-import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -161,11 +160,6 @@ public static IntChecker argument(String argName, @Nullable Integer number) {
     return new IntChecker(argName, number);
   }
 
-  @Deprecated(forRemoval = true)
-  public static FileChecker argument(String argName, @Nullable File file) {
-    return new FileChecker(argName, file);
-  }
-
   public static PathChecker argument(String argName, @Nullable Path path) {
     return new PathChecker(argName, path);
   }
@@ -180,11 +174,6 @@ public static <T> StateChecker<T> state(String name, @Nullable T state) {
     return new StateChecker<>(name, state);
   }
 
-  @Deprecated(forRemoval = true)
-  public static FileStateChecker state(String name, @Nullable File file) {
-    return new FileStateChecker(name, file);
-  }
-
   public static PathStateChecker state(String name, @Nullable Path path) {
     return new PathStateChecker(name, path);
   }
@@ -255,48 +244,6 @@ public int greaterThan(int max, String message) {
     }
   }
 
-  @Deprecated(forRemoval = true)
-  public static class FileChecker {
-
-    private final String argName;
-    private final @Nullable File file;
-
-    FileChecker(String argName, @Nullable File file) {
-      this.argName = argName;
-      this.file = file;
-    }
-
-    public File isFile() {
-      if (file == null) {
-        throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
-      }
-      if (!file.exists()) {
-        throw new IllegalArgumentException(
-            String.format(MUST_EXIST, argName, file.getAbsolutePath()));
-      }
-      if (!file.isFile()) {
-        throw new IllegalArgumentException(
-            String.format(MUST_BE_FILE, argName, file.getAbsolutePath()));
-      }
-      return file;
-    }
-
-    public File isDirectory() {
-      if (file == null) {
-        throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
-      }
-      if (!file.exists()) {
-        throw new IllegalArgumentException(
-            String.format(MUST_EXIST, argName, file.getAbsolutePath()));
-      }
-      if (!file.isDirectory()) {
-        throw new IllegalArgumentException(
-            String.format(MUST_BE_DIR, argName, file.getAbsolutePath()));
-      }
-      return file;
-    }
-  }
-
   public static class PathChecker {
 
     private final String argName;
@@ -373,58 +320,6 @@ public T instanceOf(Class<?> cls) {
     }
   }
 
-  @Deprecated(forRemoval = true)
-  public static class FileStateChecker {
-
-    private final String name;
-    private final @Nullable File file;
-
-    FileStateChecker(String name, @Nullable File file) {
-      this.name = name;
-      this.file = file;
-    }
-
-    public File isFile() {
-      if (file == null) {
-        throw new IllegalStateException(String.format(MUST_BE_SET, name));
-      }
-      if (!file.exists()) {
-        throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
-      }
-      if (!file.isFile()) {
-        throw new IllegalStateException(String.format(MUST_BE_FILE, name, file.getAbsolutePath()));
-      }
-      return file;
-    }
-
-    public File isDirectory() {
-      if (file == null) {
-        throw new IllegalStateException(String.format(MUST_BE_SET, name));
-      }
-      if (!file.exists()) {
-        throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
-      }
-      if (!file.isDirectory()) {
-        throw new IllegalStateException(String.format(MUST_BE_DIR, name, file.getAbsolutePath()));
-      }
-      return file;
-    }
-
-    public File isExecutable() {
-      if (file == null) {
-        throw new IllegalStateException(String.format(MUST_BE_SET, name));
-      }
-      if (!file.exists()) {
-        throw new IllegalStateException(String.format(MUST_EXIST, name, file.getAbsolutePath()));
-      }
-      if (!file.canExecute()) {
-        throw new IllegalStateException(
-            String.format(MUST_BE_EXECUTABLE, name, file.getAbsolutePath()));
-      }
-      return file;
-    }
-  }
-
   public static class PathStateChecker {
 
     private final String name;

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

@@ -32,9 +32,4 @@ public ScreenshotException(Throwable cause) {
   public ScreenshotException(String message, Throwable cause) {
     super(message, cause);
   }
-
-  @Deprecated(forRemoval = true)
-  public String getBase64EncodedScreenshot() {
-    return null;
-  }
 }

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

@@ -116,7 +116,7 @@ script provided with `selenium-webdriver`.
 API documentation is available online from the [Selenium project][api].
 Additional resources include
 
-- the #selenium channel on freenode IRC
+- the #selenium channel on Libera IRC
 - the [[email protected]][users] list
 - [SeleniumHQ](https://selenium.dev/documentation/) documentation
 

javascript/selenium-webdriver/README.md

@@ -77,7 +77,11 @@ def __init__(self, parent, id_) -> None:
         self._id = id_
 
     def __repr__(self):
-        return f'<{type(self).__module__}.{type(self).__name__} (session="{self._parent.session_id}", element="{self._id}")>'
+        return f'<{type(self).__module__}.{type(self).__name__} (session="{self.session_id}", element="{self._id}")>'
+
+    @property
+    def session_id(self) -> str:
+        return self._parent.session_id
 
     @property
     def tag_name(self) -> str:

py/selenium/webdriver/remote/webelement.py

@@ -81,15 +81,15 @@ def __init__(
         # avoid the divide by zero
         if self._poll == 0:
             self._poll = POLL_FREQUENCY
-        exceptions = list(IGNORED_EXCEPTIONS)
+        exceptions: list = list(IGNORED_EXCEPTIONS)
         if ignored_exceptions:
             try:
                 exceptions.extend(iter(ignored_exceptions))
             except TypeError:  # ignored_exceptions is not iterable
                 exceptions.append(ignored_exceptions)
         self._ignored_exceptions = tuple(exceptions)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f'<{type(self).__module__}.{type(self).__name__} (session="{self._driver.session_id}")>'
 
     def until(self, method: Callable[[D], Union[Literal[False], T]], message: str = "") -> T:

py/selenium/webdriver/support/wait.py

@@ -24,6 +24,7 @@
 @pytest.fixture
 def options():
     options = FirefoxOptions()
+    options.add_argument("-remote-allow-system-access")
     return options
 
 

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

@@ -4,6 +4,9 @@ set -eufo pipefail
 # We want to see what's going on
 set -x
 
+# Define heap size for GitHub Actions runner
+HEAP_SIZE="-Xmx4g"
+
 # Default to auto if no parameter is provided
 CACHE_RESULTS="auto"
 
@@ -15,7 +18,7 @@ fi
 # Now run the tests. The engflow build uses pinned browsers
 # so this should be fine
 # shellcheck disable=SC2046
-bazel test --config=rbe-ci --build_tests_only \
+bazel --host_jvm_args=${HEAP_SIZE} test --config=rbe-ci --build_tests_only \
   --keep_going --flaky_test_attempts=2 \
   --cache_test_results=${CACHE_RESULTS} \
   //... -- $(cat .skipped-tests | tr '\n' ' ')