expected_conditions and wait modules raises InvalidSelectorException …

…for invalid xpaths (#9805)

Co-authored-by: David Burns <[email protected]>

py/selenium/webdriver/support/expected_conditions.py

@@ -17,7 +17,7 @@
 
 import re
 
-from selenium.common.exceptions import NoSuchElementException
+from selenium.common.exceptions import NoSuchElementException, InvalidSelectorException
 from selenium.common.exceptions import NoSuchFrameException
 from selenium.common.exceptions import StaleElementReferenceException
 from selenium.common.exceptions import WebDriverException
@@ -123,6 +123,8 @@ def visibility_of_element_located(locator):
     def _predicate(driver):
         try:
             return _element_if_visible(driver.find_element(*locator))
+        except InvalidSelectorException as e:
+            raise e
         except StaleElementReferenceException:
             return False
 
@@ -188,6 +190,8 @@ def _predicate(driver):
                 if _element_if_visible(element, visibility=False):
                     return False
             return elements
+        except InvalidSelectorException as e:
+            raise e
         except StaleElementReferenceException:
             return False
 
@@ -204,6 +208,8 @@ def _predicate(driver):
         try:
             element_text = driver.find_element(*locator).text
             return text_ in element_text
+        except InvalidSelectorException as e:
+            raise e
         except StaleElementReferenceException:
             return False
 
@@ -220,6 +226,8 @@ def _predicate(driver):
         try:
             element_text = driver.find_element(*locator).get_attribute("value")
             return text_ in element_text
+        except InvalidSelectorException as e:
+            raise e
         except StaleElementReferenceException:
             return False
 
@@ -239,6 +247,8 @@ def _predicate(driver):
             else:
                 driver.switch_to.frame(locator)
             return True
+        except InvalidSelectorException as e:
+            raise e
         except NoSuchFrameException:
             return False
 
@@ -258,6 +268,8 @@ def _predicate(driver):
             if not isinstance(target, WebElement):
                 target = driver.find_element(*target)
             return _element_if_visible(target, False)
+        except InvalidSelectorException as e:
+            raise e
         except (NoSuchElementException, StaleElementReferenceException):
             # In the case of NoSuchElement, returns true because the element is
             # not present in DOM. The try block checks if the element is present
@@ -312,6 +324,8 @@ def _predicate(_):
             # Calling any method forces a staleness check
             element.is_enabled()
             return False
+        except InvalidSelectorException as e:
+            raise e
         except StaleElementReferenceException:
             return True
 
@@ -362,6 +376,8 @@ def _predicate(driver):
         try:
             element = driver.find_element(*locator)
             return element.is_selected() == is_selected
+        except InvalidSelectorException as e:
+            raise e
         except StaleElementReferenceException:
             return False
 
@@ -407,6 +423,8 @@ def _predicate(driver):
         try:
             element_attribute = driver.find_element(*locator).get_attribute(attribute_)
             return element_attribute is not None
+        except InvalidSelectorException as e:
+            raise e
         except StaleElementReferenceException:
             return False
 

py/selenium/webdriver/support/wait.py

@@ -16,7 +16,7 @@
 # under the License.
 
 import time
-from selenium.common.exceptions import NoSuchElementException
+from selenium.common.exceptions import NoSuchElementException, InvalidSelectorException
 from selenium.common.exceptions import TimeoutException
 
 POLL_FREQUENCY = 0.5  # How long to sleep inbetween calls to the method
@@ -78,6 +78,8 @@ def until(self, method, message=''):
                 value = method(self._driver)
                 if value:
                     return value
+            except InvalidSelectorException as e:
+                raise e
             except self._ignored_exceptions as exc:
                 screen = getattr(exc, 'screen', None)
                 stacktrace = getattr(exc, 'stacktrace', None)
@@ -102,6 +104,8 @@ def until_not(self, method, message=''):
                 value = method(self._driver)
                 if not value:
                     return value
+            except InvalidSelectorException as e:
+                raise e
             except self._ignored_exceptions:
                 return True
             time.sleep(self._poll)

py/test/selenium/webdriver/common/webdriverwait_tests.py

@@ -19,7 +19,7 @@
 
 import pytest
 
-from selenium.common.exceptions import TimeoutException
+from selenium.common.exceptions import TimeoutException, InvalidSelectorException
 from selenium.common.exceptions import StaleElementReferenceException
 from selenium.common.exceptions import WebDriverException
 from selenium.common.exceptions import InvalidElementStateException
@@ -32,6 +32,12 @@ def throwSERE(driver):
     raise StaleElementReferenceException("test")
 
 
+def testShouldFailWithInvalidSelectorException(driver, pages):
+    pages.load("dynamic.html")
+    with pytest.raises(InvalidSelectorException):
+        WebDriverWait(driver, 0.7).until(EC.presence_of_element_located((By.XPATH, "//*[contains(@id,'something'")))
+
+
 def testShouldExplicitlyWaitForASingleElement(driver, pages):
     pages.load("dynamic.html")
     add = driver.find_element(By.ID, "adder")