Merge branch 'trunk' into fix-ruby-handling-of-unhandled_prompt_behavior

Author: aguspe

dotnet/src/webdriver/InvalidSelectorException.cs

@@ -30,7 +30,7 @@ public class InvalidSelectorException : WebDriverException
     /// <summary>
     /// Link to the documentation for this error
     /// </summary>
-    private static string supportUrl = baseSupportUrl + "#invalid-selector-exception";
+    private static string supportUrl = baseSupportUrl + "#invalidselectorexception";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="InvalidSelectorException"/> class.

dotnet/src/webdriver/NoSuchElementException.cs

@@ -31,7 +31,7 @@ public class NoSuchElementException : NotFoundException
     /// <summary>
     /// Link to the documentation for this error
     /// </summary>
-    private static string supportUrl = baseSupportUrl + "#no-such-element-exception";
+    private static string supportUrl = baseSupportUrl + "#nosuchelementexception";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="NoSuchElementException"/> class.

dotnet/src/webdriver/StaleElementReferenceException.cs

@@ -30,7 +30,7 @@ public class StaleElementReferenceException : WebDriverException
     /// <summary>
     /// Link to the documentation for this error
     /// </summary>
-    private static string supportUrl = baseSupportUrl + "#stale-element-reference-exception";
+    private static string supportUrl = baseSupportUrl + "#staleelementreferenceexception";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="StaleElementReferenceException"/> class.

java/src/org/openqa/selenium/InvalidSelectorException.java

@@ -27,7 +27,7 @@
  */
 public class InvalidSelectorException extends WebDriverException {
 
-  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#invalid-selector-exception";
+  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#invalidselectorexception";
 
   public InvalidSelectorException(String reason) {
     super(reason);

java/src/org/openqa/selenium/NoSuchElementException.java

@@ -27,7 +27,7 @@
 @NullMarked
 public class NoSuchElementException extends NotFoundException {
 
-  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#no-such-element-exception";
+  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#nosuchelementexception";
 
   public NoSuchElementException(@Nullable String reason) {
     super(reason);

java/src/org/openqa/selenium/StaleElementReferenceException.java

@@ -27,7 +27,7 @@
 @NullMarked
 public class StaleElementReferenceException extends WebDriverException {
 
-  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#stale-element-reference-exception";
+  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#staleelementreferenceexception";
 
   public StaleElementReferenceException(@Nullable String message) {
     super(message);

py/selenium/webdriver/common/utils.py

@@ -14,9 +14,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-"""The Utils methods."""
+
+"""Utility functions."""
 
 import socket
+import urllib.request
 from collections.abc import Iterable
 from typing import Optional, Union
 
@@ -67,8 +69,8 @@ def find_connectable_ip(host: Union[str, bytes, bytearray, None], port: Optional
     port are considered.
 
     :Args:
-        - host - A hostname.
-        - port - Optional port number.
+        - host - hostname
+        - port - port number
 
     :Returns:
         A single IP address, as a string. If any IPv4 address is found, one is
@@ -100,8 +102,8 @@ def join_host_port(host: str, port: int) -> str:
     example, _join_host_port('::1', 80) == '[::1]:80'.
 
     :Args:
-        - host - A hostname.
-        - port - An integer port.
+        - host - hostname or IP
+        - port - port number
     """
     if ":" in host and not host.startswith("["):
         return f"[{host}]:{port}"
@@ -112,7 +114,8 @@ def is_connectable(port: int, host: Optional[str] = "localhost") -> bool:
     """Tries to connect to the server at port to see if it is running.
 
     :Args:
-     - port - The port to connect.
+        - port - port number
+        - host - hostname or IP
     """
     socket_ = None
     try:
@@ -130,18 +133,22 @@ def is_connectable(port: int, host: Optional[str] = "localhost") -> bool:
     return result
 
 
-def is_url_connectable(port: Union[int, str]) -> bool:
-    """Tries to connect to the HTTP server at /status path and specified port
-    to see if it responds successfully.
+def is_url_connectable(
+    port: Union[int, str],
+    host: Optional[str] = "127.0.0.1",
+    scheme: Optional[str] = "http",
+) -> bool:
+    """Sends a request to the HTTP server at the /status endpoint to see if it
+    responds successfully.
 
     :Args:
-     - port - The port to connect.
+        - port - port number
+        - host - hostname or IP
+        - scheme - URL scheme
     """
-    from urllib import request as url_request
-
     try:
-        res = url_request.urlopen(f"http://127.0.0.1:{port}/status")
-        return res.getcode() == 200
+        with urllib.request.urlopen(f"{scheme}://{host}:{port}/status") as res:
+            return res.getcode() == 200
     except Exception:
         return False
 

rb/lib/selenium/webdriver/common/error.rb

@@ -38,9 +38,9 @@ def self.for_error(error)
       ERROR_URL = 'https://www.selenium.dev/documentation/webdriver/troubleshooting/errors'
 
       URLS = {
-        NoSuchElementError: "#{ERROR_URL}#no-such-element-exception",
-        StaleElementReferenceError: "#{ERROR_URL}#stale-element-reference-exception",
-        InvalidSelectorError: "#{ERROR_URL}#invalid-selector-exception",
+        NoSuchElementError: "#{ERROR_URL}#nosuchelementexception",
+        StaleElementReferenceError: "#{ERROR_URL}#staleelementreferenceexception",
+        InvalidSelectorError: "#{ERROR_URL}#invalidselectorexception",
         NoSuchDriverError: "#{ERROR_URL}/driver_location"
       }.freeze
 

rb/spec/integration/selenium/webdriver/driver_spec.rb

@@ -149,15 +149,15 @@ module WebDriver
           driver.navigate.to url_for('xhtmlTest.html')
           expect {
             driver.find_element(id: 'not-there')
-          }.to raise_error(Error::NoSuchElementError, /errors#no-such-element-exception/)
+          }.to raise_error(Error::NoSuchElementError, /errors#nosuchelementexception/)
         end
 
         it 'raises if invalid locator',
            exclude: {browser: %i[safari safari_preview], reason: 'Safari TimeoutError'} do
           driver.navigate.to url_for('xhtmlTest.html')
           expect {
             driver.find_element(xpath: '*?//-')
-          }.to raise_error(Error::InvalidSelectorError, /errors#invalid-selector-exception/)
+          }.to raise_error(Error::InvalidSelectorError, /errors#invalidselectorexception/)
         end
       end
 

rb/spec/integration/selenium/webdriver/element_spec.rb

@@ -46,7 +46,7 @@ module WebDriver
         driver.navigate.refresh
 
         expect { button.click }.to raise_exception(Error::StaleElementReferenceError,
-                                                   /errors#stale-element-reference-exception/)
+                                                   /errors#staleelementreferenceexception/)
 
         reset_driver!(time: 1) if %i[safari safari_preview].include? GlobalTestEnv.browser
       end