Refactoring

Author: mdmintz

seleniumbase/fixtures/base_case.py

@@ -407,7 +407,7 @@ def click(
         except Stale_Exception:
             self.wait_for_ready_state_complete()
             time.sleep(0.16)
-            element = page_actions.wait_for_element_visible(
+            element = page_actions.wait_for_element_clickable(
                 self.driver,
                 selector,
                 by,
@@ -444,6 +444,22 @@ def click(
                 timeout=timeout,
                 original_selector=original_selector,
             )
+            if not page_actions.is_element_clickable(
+                self.driver, selector, by
+            ):
+                try:
+                    self.wait_for_element_clickable(
+                        selector, by, timeout=1.8
+                    )
+                except Exception:
+                    pass  # Find out which element would get the click instead
+                element = page_actions.wait_for_element_visible(
+                    self.driver,
+                    selector,
+                    by,
+                    timeout=timeout,
+                    original_selector=original_selector,
+                )
             href = None
             new_tab = False
             onclick = None
@@ -500,7 +516,7 @@ def click(
                     self.__jquery_click(selector, by=by)
                 except Exception:
                     # One more attempt to click on the element
-                    element = page_actions.wait_for_element_visible(
+                    element = page_actions.wait_for_element_clickable(
                         self.driver,
                         selector,
                         by,
@@ -2748,7 +2764,7 @@ def __select_option(
         )
         try:
             element = self.wait_for_element_clickable(
-                dropdown_selector, by=dropdown_by, timeout=1.2
+                dropdown_selector, by=dropdown_by, timeout=1.8
             )
         except Exception:
             self.wait_for_ready_state_complete()
@@ -2775,7 +2791,7 @@ def __select_option(
             )
             try:
                 element = self.wait_for_element_clickable(
-                    dropdown_selector, by=dropdown_by, timeout=1.2
+                    dropdown_selector, by=dropdown_by, timeout=1.8
                 )
             except Exception:
                 self.wait_for_ready_state_complete()
@@ -12121,7 +12137,7 @@ def __js_click(self, selector, by="css selector"):
                 ):
                     try:
                         self.wait_for_element_clickable(
-                            selector, by, timeout=1.2
+                            selector, by, timeout=1.8
                         )
                     except Exception:
                         pass