Simplify hover actions

Author: mdmintz

help_docs/method_summary.md

@@ -151,7 +151,9 @@ self.is_element_in_an_iframe(selector, by="css selector")
 
 self.switch_to_frame_of_element(selector, by="css selector")
 
-self.hover_on_element(selector, by="css selector")
+self.hover(selector, by="css selector", timeout=None)
+# Duplicates: self.hover_on_element(selector, by="css selector", timeout=None)
+#             self.hover_over_element(selector, by="css selector", timeout=None)
 
 self.hover_and_click(
     hover_selector, click_selector,

seleniumbase/fixtures/base_case.py

@@ -2243,50 +2243,34 @@ def switch_to_frame_of_element(self, selector, by="css selector"):
                 "element {%s}!" % selector
             )
 
-    def hover_on_element(self, selector, by="css selector"):
+    def hover(self, selector, by="css selector", timeout=None):
         self.__check_scope()
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+            timeout = self.__get_new_timeout(timeout)
         original_selector = selector
         original_by = by
         selector, by = self.__recalculate_selector(selector, by)
         self.wait_for_element_visible(
-            original_selector, by=original_by, timeout=settings.SMALL_TIMEOUT
+            original_selector, by=original_by, timeout=timeout
         )
         self.__demo_mode_highlight_if_active(original_selector, original_by)
         self.scroll_to(selector, by=by)
         time.sleep(0.05)  # Settle down from scrolling before hovering
-        if self.browser != "chrome":
-            return page_actions.hover_on_element(self.driver, selector, by)
-        # Using Chrome
-        # (Pure hover actions won't work on early chromedriver versions)
-        try:
-            return page_actions.hover_on_element(self.driver, selector, by)
-        except WebDriverException:
-            driver_capabilities = self.driver.capabilities
-            if "version" in driver_capabilities:
-                chrome_version = driver_capabilities["version"]
-            else:
-                chrome_version = driver_capabilities["browserVersion"]
-            major_chrome_version = chrome_version.split(".")[0]
-            chrome_dict = self.driver.capabilities["chrome"]
-            chromedriver_version = chrome_dict["chromedriverVersion"]
-            chromedriver_version = chromedriver_version.split(" ")[0]
-            major_chromedriver_version = chromedriver_version.split(".")[0]
-            install_sb = (
-                "seleniumbase get chromedriver %s" % major_chrome_version
-            )
-            if int(major_chromedriver_version) < int(major_chrome_version):
-                # Upgrading the driver is required for performing hover actions
-                message = (
-                    "You need a newer version of\n"
-                    "chromedriver to perform hover actions!\n"
-                    "Your version of chromedriver is: %s\n"
-                    "And your version of Chrome is: %s\n"
-                    "You can fix this issue by running:\n>>> %s\n"
-                    % (chromedriver_version, chrome_version, install_sb)
-                )
-                raise Exception(message)
-            else:
-                raise
+        element = page_actions.hover_on_element(self.driver, selector, by)
+        if self.recorder_mode:
+            url = self.get_current_url()
+            if url and len(url) > 0:
+                if ("http:") in url or ("https:") in url or ("file:") in url:
+                    if self.get_session_storage_item("pause_recorder") == "no":
+                        if by == By.XPATH:
+                            selector = original_selector
+                        time_stamp = self.execute_script("return Date.now();")
+                        origin = self.get_origin()
+                        action = ["hover", selector, origin, time_stamp]
+                        self.__extra_actions.append(action)
+        return element
 
     def hover_and_click(
         self,
@@ -7589,6 +7573,24 @@ def click_partial_link(self, partial_link_text, timeout=None):
             timeout = self.__get_new_timeout(timeout)
         self.click_partial_link_text(partial_link_text, timeout=timeout)
 
+    def hover_on_element(self, selector, by="css selector", timeout=None):
+        """Same as self.hover()"""
+        self.__check_scope()
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+            timeout = self.__get_new_timeout(timeout)
+        return self.hover(selector, by=by, timeout=timeout)
+
+    def hover_over_element(self, selector, by="css selector", timeout=None):
+        """Same as self.hover()"""
+        self.__check_scope()
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+            timeout = self.__get_new_timeout(timeout)
+        return self.hover(selector, by=by, timeout=timeout)
+
     def wait_for_element_visible(
         self, selector, by="css selector", timeout=None
     ):

seleniumbase/fixtures/page_actions.py

@@ -174,6 +174,7 @@ def hover_on_element(driver, selector, by="css selector"):
     element = driver.find_element(by=by, value=selector)
     hover = ActionChains(driver).move_to_element(element)
     hover.perform()
+    return element
 
 
 def hover_element(driver, element):
@@ -182,6 +183,7 @@ def hover_element(driver, element):
     """
     hover = ActionChains(driver).move_to_element(element)
     hover.perform()
+    return element
 
 
 def timeout_exception(exception, message):