Merge branch 'trunk' into java-bc-event-tests

Author: diemol

java/src/org/openqa/selenium/support/ui/Select.java

@@ -122,55 +122,7 @@ public WebElement getFirstSelectedOption() {
    */
   @Override
   public void selectByVisibleText(String text) {
-    assertSelectIsEnabled();
-    assertSelectIsVisible();
-
-    // try to find the option via XPATH ...
-    List<WebElement> options =
-        element.findElements(
-            By.xpath(".//option[normalize-space(.) = " + Quotes.escape(text) + "]"));
-
-    for (WebElement option : options) {
-      if (!hasCssPropertyAndVisible(option))
-        throw new NoSuchElementException("Invisible option with text: " + text);
-      setSelected(option, true);
-      if (!isMultiple()) {
-        return;
-      }
-    }
-
-    boolean matched = !options.isEmpty();
-    if (!matched && text.contains(" ")) {
-      String subStringWithoutSpace = getLongestSubstringWithoutSpace(text);
-      List<WebElement> candidates;
-      if ("".equals(subStringWithoutSpace)) {
-        // hmm, text is either empty or contains only spaces - get all options ...
-        candidates = element.findElements(By.tagName("option"));
-      } else {
-        // get candidates via XPATH ...
-        candidates =
-            element.findElements(
-                By.xpath(".//option[contains(., " + Quotes.escape(subStringWithoutSpace) + ")]"));
-      }
-
-      String trimmed = text.trim();
-
-      for (WebElement option : candidates) {
-        if (trimmed.equals(option.getText().trim())) {
-          if (!hasCssPropertyAndVisible(option))
-            throw new NoSuchElementException("Invisible option with text: " + text);
-          setSelected(option, true);
-          if (!isMultiple()) {
-            return;
-          }
-          matched = true;
-        }
-      }
-    }
-
-    if (!matched) {
-      throw new NoSuchElementException("Cannot locate option with text: " + text);
-    }
+    selectByVisibleText(text, false);
   }
 
   /**
@@ -193,53 +145,7 @@ public void selectByVisibleText(String text) {
    */
   @Override
   public void selectByContainsVisibleText(String text) {
-    assertSelectIsEnabled();
-    assertSelectIsVisible();
-
-    // try to find the option via XPATH ...
-    List<WebElement> options =
-        element.findElements(
-            By.xpath(".//option[normalize-space(.) = " + Quotes.escape(text) + "]"));
-
-    for (WebElement option : options) {
-      if (!hasCssPropertyAndVisible(option))
-        throw new NoSuchElementException("Invisible option with text: " + text);
-      setSelected(option, true);
-      if (!isMultiple()) {
-        return;
-      }
-    }
-
-    boolean matched = !options.isEmpty();
-    if (!matched) {
-      String searchText = text.contains(" ") ? getLongestSubstringWithoutSpace(text) : text;
-
-      List<WebElement> candidates;
-      if (searchText.isEmpty()) {
-        candidates = element.findElements(By.tagName("option"));
-      } else {
-        candidates =
-            element.findElements(
-                By.xpath(".//option[contains(., " + Quotes.escape(searchText) + ")]"));
-      }
-
-      String trimmed = text.trim();
-      for (WebElement option : candidates) {
-        if (option.getText().contains(trimmed)) {
-          if (!hasCssPropertyAndVisible(option))
-            throw new NoSuchElementException("Invisible option with text: " + text);
-          setSelected(option, true);
-          if (!isMultiple()) {
-            return;
-          }
-          matched = true;
-        }
-      }
-    }
-
-    if (!matched) {
-      throw new NoSuchElementException("Cannot locate option with text: " + text);
-    }
+    selectByVisibleText(text, true);
   }
 
   private String getLongestSubstringWithoutSpace(String s) {
@@ -425,6 +331,73 @@ private void setSelected(WebElement option, boolean select) {
     }
   }
 
+  /**
+   * @param text The visible text to match against. It can be a partial match of the option if
+   *     isPartialMatch = true
+   * @param isPartialMatch If true a partial match on the Options list will be performed, otherwise
+   *     exact match
+   * @throws NoSuchElementException If no matching option elements are found or matching options are
+   *     hidden
+   */
+  private void selectByVisibleText(String text, boolean isPartialMatch) {
+    assertSelectIsEnabled();
+    assertSelectIsVisible();
+
+    // try to find the option via XPATH ...
+    List<WebElement> options =
+        element.findElements(
+            By.xpath(".//option[normalize-space(.) = " + Quotes.escape(text) + "]"));
+
+    for (WebElement option : options) {
+      if (!hasCssPropertyAndVisible(option))
+        throw new NoSuchElementException("Invisible option with text: " + text);
+
+      setSelected(option, true);
+
+      if (!isMultiple()) {
+        return;
+      }
+    }
+
+    boolean matched = !options.isEmpty();
+    if (!matched) {
+      String searchText = text.contains(" ") ? getLongestSubstringWithoutSpace(text) : text;
+
+      List<WebElement> candidates;
+      if (searchText.isEmpty()) {
+        candidates = element.findElements(By.tagName("option"));
+      } else {
+        candidates =
+            element.findElements(
+                By.xpath(".//option[contains(., " + Quotes.escape(searchText) + ")]"));
+      }
+
+      String trimmed = text.trim();
+      for (WebElement option : candidates) {
+        boolean isMatchedOptionFound =
+            isPartialMatch
+                ? option.getText().contains(trimmed)
+                : option.getText().trim().equals(trimmed);
+
+        if (isMatchedOptionFound) {
+          if (!hasCssPropertyAndVisible(option))
+            throw new NoSuchElementException("Invisible option with text: " + text);
+
+          setSelected(option, true);
+
+          if (!isMultiple()) {
+            return;
+          }
+          matched = true;
+        }
+      }
+    }
+
+    if (!matched) {
+      throw new NoSuchElementException("Cannot locate option with text: " + text);
+    }
+  }
+
   private void assertOptionIsEnabled(WebElement option, boolean select) {
     if (select && !option.isEnabled()) {
       throw new UnsupportedOperationException("You may not select a disabled option");

javascript/atoms/dom.js

@@ -1173,11 +1173,18 @@ bot.dom.appendVisibleTextLinesFromTextNode_ = function (textNode, lines,
   }
 
   if (textTransform == 'capitalize') {
-    // the unicode regex ending with /gu does not work in IE
-    var re = goog.userAgent.IE ? /(^|\s|\b)(\S)/g : /(^|\s|\b)(\S)/gu;
+    // 1) don't treat '_' as a separator (protects snake_case)
+    var re = /(^|[^'_0-9A-Za-z\u00C0-\u02AF\u1E00-\u1EFF\u24B6-\u24E9\u0300-\u036F\u1AB0-\u1AFF\u1DC0-\u1DFF])([A-Za-z\u00C0-\u02AF\u1E00-\u1EFF\u24B6-\u24E9])/g;
     text = text.replace(re, function () {
       return arguments[1] + arguments[2].toUpperCase();
     });
+
+    // 2) capitalize after opening "_" or "*"
+    // Preceded by start or a non-word (so it won't fire for snake_case)
+    re = /(^|[^'_0-9A-Za-z\u00C0-\u02AF\u1E00-\u1EFF\u24B6-\u24E9])([_*])([A-Za-z\u00C0-\u02AF\u1E00-\u1EFF\u24D0-\u24E9])/g;
+    text = text.replace(re, function () {
+      return arguments[1] + arguments[2] + arguments[3].toUpperCase();
+    });
   } else if (textTransform == 'uppercase') {
     text = text.toUpperCase();
   } else if (textTransform == 'lowercase') {

javascript/atoms/test/text_test.html

@@ -235,13 +235,13 @@
     function testShouldRetainTheFormattingOfTextWithinAPreElement() {
       var text = getVisibleTextByElementId("preformatted");
 
-      assertEquals("   This section has a preformatted\n    text block    \n  split in four lines\n         ", text);
+      assertEquals("   This section has a preformatted\n    text block\n  split in four lines\n         ", text);
     }
 
     function testShouldRetainTheFormattingOfTextWithinAPreElementThatIsWithinARegularBlock() {
       var text = getVisibleTextByElementId("div-with-pre");
 
-      assertEquals("before pre\n   This section has a preformatted\n    text block    \n  split in four lines\n         \nafter pre", text);
+      assertEquals("before pre\n   This section has a preformatted\n    text block\n  split in four lines\n         \nafter pre", text);
     }
 
     function testGetVisibleTextShouldHandleCssContentReplacement() {
@@ -264,6 +264,11 @@
       text = getVisibleTextByElementId("uppercased");
       assertEquals("HELLO, WORLD! BLA-BLA-BLA", text);
 
+      text = getVisibleTextByElementId("capitalized_accented_character");
+      assertEquals("Fecha De Expiración", text);
+      text = getVisibleTextByElementId("capitalized_enye");
+      assertEquals("Mañana", text);
+
       text = getVisibleTextByElementId("capitalized-1");
       assertEquals("Äåìî", text);
       text = getVisibleTextByElementId("capitalized-2");
@@ -423,6 +428,11 @@
     <a id="uppercased" style="text-transform: uppercase">hello, world! bla-bla-BLA</a><br/>
   </div>
 
+  <div>
+    <a id="capitalized_accented_character" style="text-transform: capitalize">Fecha de expiración</a><br/>
+    <a id="capitalized_enye" style="text-transform: capitalize">mañana</a><br/>
+  </div>
+
   <div>
     <a lang="ru" id="capitalized-1" style="text-transform: capitalize">äåìî</a><br/>
     <a id="capitalized-2" style="text-transform: capitalize">Manipulowanie przepływem</a><br/>

py/BUILD.bazel

@@ -328,11 +328,11 @@ py_wheel(
     python_tag = "py3",
     requires = [
         "urllib3[socks]>=2.5.0,<3.0",
-        "trio~=0.30.0",
-        "trio-websocket~=0.12.2",
+        "trio>=0.30.0,<1.0",
+        "trio-websocket>=0.12.2,<1.0",
         "certifi>=2025.6.15",
-        "typing_extensions~=4.14.0",
-        "websocket-client~=1.8.0",
+        "typing_extensions>=4.14.0,<5.0",
+        "websocket-client>=1.8.0,<2.0",
     ],
     strip_path_prefixes = [
         "py/",

py/conftest.py

@@ -16,7 +16,7 @@
 # under the License.
 
 import os
-import platform
+import sys
 from dataclasses import dataclass
 from pathlib import Path
 
@@ -182,7 +182,14 @@ def driver_class(self, cls_name):
 
     @property
     def exe_platform(self):
-        return platform.system()
+        if sys.platform == "win32":
+            return "Windows"
+        elif sys.platform == "darwin":
+            return "Darwin"
+        elif sys.platform == "linux":
+            return "Linux"
+        else:
+            return sys.platform.title()
 
     @property
     def browser_path(self):
@@ -397,7 +404,7 @@ def server(request):
     )
 
     remote_env = os.environ.copy()
-    if platform.system() == "Linux":
+    if sys.platform == "linux":
         # There are issues with window size/position when running Firefox
         # under Wayland, so we use XWayland instead.
         remote_env["MOZ_ENABLE_WAYLAND"] = "0"

py/pyproject.toml

@@ -27,11 +27,11 @@ classifiers = [
     ]
 dependencies = [
     "urllib3[socks]>=2.5.0,<3.0",
-    "trio~=0.30.0",
-    "trio-websocket~=0.12.2",
+    "trio>=0.30.0,<1.0",
+    "trio-websocket>=0.12.2,<1.0",
     "certifi>=2025.6.15",
-    "typing_extensions~=4.14.0",
-    "websocket-client~=1.8.0",
+    "typing_extensions>=4.14.0,<5.0",
+    "websocket-client>=1.8.0,<2.0",
     ]
 
 [project.urls]

py/selenium/webdriver/common/actions/action_builder.py

@@ -15,7 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import Optional, Union
+
+from typing import Any, Optional, Union
 
 from selenium.webdriver.remote.command import Command
 
@@ -40,7 +41,7 @@ def __init__(
         mouse = mouse or PointerInput(interaction.POINTER_MOUSE, "mouse")
         keyboard = keyboard or KeyInput(interaction.KEY)
         wheel = wheel or WheelInput(interaction.WHEEL)
-        self.devices = [mouse, keyboard, wheel]
+        self.devices: list[Union[PointerInput, KeyInput, WheelInput]] = [mouse, keyboard, wheel]
         self._key_action = KeyActions(keyboard)
         self._pointer_action = PointerActions(mouse, duration=duration)
         self._wheel_action = WheelActions(wheel)
@@ -62,11 +63,11 @@ def get_device_with(self, name: str) -> Optional[Union["WheelInput", "PointerInp
 
     @property
     def pointer_inputs(self) -> list[PointerInput]:
-        return [device for device in self.devices if device.type == interaction.POINTER]
+        return [device for device in self.devices if isinstance(device, PointerInput)]
 
     @property
     def key_inputs(self) -> list[KeyInput]:
-        return [device for device in self.devices if device.type == interaction.KEY]
+        return [device for device in self.devices if isinstance(device, KeyInput)]
 
     @property
     def key_action(self) -> KeyActions:
@@ -159,7 +160,7 @@ def perform(self) -> None:
         >>> el = driver.find_element(id: "some_id")
         >>> action_builder.click(el).pause(keyboard).pause(keyboard).pause(keyboard).send_keys("keys").perform()
         """
-        enc = {"actions": []}
+        enc: dict[str, list[Any]] = {"actions": []}
         for device in self.devices:
             encoded = device.encode()
             if encoded["actions"]: