Merge pull request #1511 from seleniumbase/remove-expected-conditions

Replace "expected_conditions" with alternatives

Author: mdmintz

requirements.txt

@@ -61,7 +61,8 @@ more-itertools==8.14.0;python_version>="3.6"
 cssselect==1.1.0
 sortedcontainers==2.4.0
 fasteners==0.16;python_version<"3.6"
-fasteners==0.17.3;python_version>="3.6"
+fasteners==0.17.3;python_version>="3.6" and python_version<"3.7"
+fasteners==0.18;python_version>="3.7"
 execnet==1.9.0
 pluggy==0.13.1;python_version<"3.6"
 pluggy==1.0.0;python_version>="3.6"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.4.0"
+__version__ = "4.4.1"

seleniumbase/fixtures/base_case.py

@@ -7283,14 +7283,9 @@ def __is_shadow_element_visible(self, selector):
             return False
 
     def __is_shadow_element_clickable(self, selector):
-        from selenium.webdriver.support import expected_conditions as EC
-        from selenium.webdriver.support.ui import WebDriverWait
-
         try:
             element = self.__get_shadow_element(selector, timeout=0.1)
-            if element.is_displayed() and WebDriverWait(self.driver, 0).until(
-                EC.element_to_be_clickable(element)
-            ):
+            if element.is_displayed() and element.is_enabled():
                 return True
             return False
         except Exception:

seleniumbase/fixtures/page_actions.py

@@ -81,14 +81,9 @@ def is_element_clickable(driver, selector, by="css selector"):
     @Returns
     Boolean (is element clickable)
     """
-    from selenium.webdriver.support import expected_conditions as EC
-    from selenium.webdriver.support.ui import WebDriverWait
-
     try:
         element = driver.find_element(by=by, value=selector)
-        if element.is_displayed() and WebDriverWait(driver, 0).until(
-            EC.element_to_be_clickable(element)
-        ):
+        if element.is_displayed() and element.is_enabled():
             return True
         return False
     except Exception:
@@ -775,9 +770,6 @@ def wait_for_element_clickable(
     @Returns
     A web element object
     """
-    from selenium.webdriver.support import expected_conditions as EC
-    from selenium.webdriver.support.ui import WebDriverWait
-
     element = None
     is_present = False
     is_visible = False
@@ -790,9 +782,7 @@ def wait_for_element_clickable(
             is_present = True
             if element.is_displayed():
                 is_visible = True
-                if WebDriverWait(driver, 0.001).until(
-                    EC.element_to_be_clickable((by, selector))
-                ):
+                if element.is_enabled():
                     return element
                 else:
                     element = None

setup.py

@@ -186,7 +186,8 @@
         "cssselect==1.1.0",
         "sortedcontainers==2.4.0",
         'fasteners==0.16;python_version<"3.6"',
-        'fasteners==0.17.3;python_version>="3.6"',
+        'fasteners==0.17.3;python_version>="3.6" and python_version<"3.7"',
+        'fasteners==0.18;python_version>="3.7"',
         "execnet==1.9.0",
         'pluggy==0.13.1;python_version<"3.6"',
         'pluggy==1.0.0;python_version>="3.6"',