Merge pull request #1594 from seleniumbase/python-3.11-updates-and-more

Python 3.11 updates and more

Author: mdmintz

mkdocs.yml

@@ -46,7 +46,7 @@ theme:
     - toc.integrate
     - navigation.indexes
     # - navigation.sections
-    - navigation.expand
+    # - navigation.expand
     # - navigation.tabs
     - navigation.top
     - navigation.tracking

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.7.1"
+__version__ = "4.7.2"

seleniumbase/fixtures/base_case.py

@@ -474,17 +474,17 @@ def click(
                     self.wait_for_ready_state_complete()
                 except Exception:
                     pass
-        if self.browser == "safari":
-            time.sleep(0.01)
-            self.wait_for_ready_state_complete()
-            time.sleep(0.01)
         if self.demo_mode:
             if self.driver.current_url != pre_action_url:
                 self.__demo_mode_pause_if_active()
             else:
                 self.__demo_mode_pause_if_active(tiny=True)
         elif self.slow_mode:
             self.__slow_mode_pause_if_active()
+        elif self.browser == "safari":
+            time.sleep(0.01)
+            self.wait_for_ready_state_complete()
+            time.sleep(0.01)
 
     def slow_click(self, selector, by="css selector", timeout=None):
         """Similar to click(), but pauses for a brief moment before clicking.
@@ -12252,7 +12252,7 @@ def __click_with_offset(
             self.execute_script(script)
         try:
             element_location = element.location["y"]
-            element_location = element_location - 130 + y
+            element_location = element_location - constants.Scroll.Y_OFFSET + y
             if element_location < 0:
                 element_location = 0
             scroll_script = "window.scrollTo(0, %s);" % element_location
@@ -12352,8 +12352,8 @@ def __jquery_slow_scroll_to(self, selector, by="css selector"):
         selector = self.__make_css_match_first_element_only(selector)
         scroll_script = (
             """jQuery([document.documentElement, document.body]).animate({"""
-            """scrollTop: jQuery('%s').offset().top - 130}, %s);"""
-            % (selector, scroll_time_ms)
+            """scrollTop: jQuery('%s').offset().top - %s}, %s);"""
+            % (selector, constants.Scroll.Y_OFFSET, scroll_time_ms)
         )
         if js_utils.is_jquery_activated(self.driver):
             self.execute_script(scroll_script)
@@ -14022,8 +14022,8 @@ def has_exception(self):
 
     def save_teardown_screenshot(self):
         """(Should ONLY be used at the start of custom tearDown() methods.)
-        This method takes a screenshot of the current web page for a
-        FAILING test (or when using "--screenshot" / "--save-screenshot").
+        This method takes a screenshot of the active page for FAILING tests
+        (or when using "--screenshot" / "--save-screenshot" / "--ss").
         That way your tearDown() method can navigate away from the last
         page where the test failed, and still get the correct screenshot
         before performing tearDown() steps on other pages. If this method
@@ -14040,15 +14040,20 @@ def save_teardown_screenshot(self):
         if self.recorder_mode:
             # In case tearDown() leaves the origin, save actions first.
             self.save_recorded_actions()
-        if self.__has_exception() or self.save_screenshot_after_test:
+        if (
+            self.__has_exception()
+            or self.save_screenshot_after_test
+            or sys.version_info >= (3, 11)
+        ):
             test_logpath = os.path.join(self.log_path, self.__get_test_id())
             self.__create_log_path_as_needed(test_logpath)
             self.__set_last_page_screenshot()
             self.__set_last_page_url()
             self.__set_last_page_source()
             sb_config._has_logs = True
-            if self.is_pytest:
-                self.__add_pytest_html_extra()
+            if self.__has_exception() or self.save_screenshot_after_test:
+                if self.is_pytest:
+                    self.__add_pytest_html_extra()
 
     def _log_fail_data(self):
         if sys.version_info < (3, 11):

seleniumbase/fixtures/constants.py

@@ -138,7 +138,11 @@ class Values:
     # Demo Mode has slow scrolling to see where you are on the page better.
     # However, a regular slow scroll takes too long to cover big distances.
     # If the scroll distance is greater than SSMD, a slow scroll speeds up.
-    SSMD = 900  # Smooth Scroll Minimum Distance (for advanced slow scroll)
+    SSMD = 500  # Smooth Scroll Minimum Distance (for advanced slow scroll)
+
+
+class Scroll:
+    Y_OFFSET = 182
 
 
 class Warnings:

seleniumbase/fixtures/js_utils.py

@@ -690,7 +690,7 @@ def activate_messenger(driver):
                 """ if (typeof Messenger === 'undefined') { return "U"; } """
             )
             if result == "U":
-                time.sleep(0.02)
+                time.sleep(0.022)
                 continue
             else:
                 break
@@ -1002,7 +1002,7 @@ def get_scroll_distance_to_element(driver, element):
         scroll_position = driver.execute_script("return window.scrollY;")
         element_location = None
         element_location = element.location["y"]
-        element_location = element_location - 130
+        element_location = element_location - constants.Scroll.Y_OFFSET
         if element_location < 0:
             element_location = 0
         distance = element_location - scroll_position
@@ -1026,7 +1026,7 @@ def scroll_to_element(driver, element):
         screen_width = driver.get_window_size()["width"]
     except Exception:
         element_location_x = 0
-    element_location_y = element_location_y - 130
+    element_location_y = element_location_y - constants.Scroll.Y_OFFSET
     if element_location_y < 0:
         element_location_y = 0
     element_location_x_fix = element_location_x - 400
@@ -1052,16 +1052,27 @@ def slow_scroll_to_element(driver, element, browser):
         scroll_to_element(driver, element)
         return
     scroll_position = driver.execute_script("return window.scrollY;")
-    element_location = None
+    element_location_y = None
     try:
-        element_location = element.location["y"]
+        element_location_y = element.location["y"]
     except Exception:
         element.location_once_scrolled_into_view
         return
-    element_location = element_location - 130
-    if element_location < 0:
-        element_location = 0
-    distance = element_location - scroll_position
+    try:
+        element_location_x = element.location["x"]
+        element_width = element.size["width"]
+        screen_width = driver.get_window_size()["width"]
+    except Exception:
+        element_location_x = 0
+    element_location_y = element_location_y - constants.Scroll.Y_OFFSET
+    if element_location_y < 0:
+        element_location_y = 0
+    element_location_x_fix = element_location_x - 400
+    if element_location_x_fix < 0:
+        element_location_x_fix = 0
+    if element_location_x + element_width <= screen_width:
+        element_location_x_fix = 0
+    distance = element_location_y - scroll_position
     if distance != 0:
         total_steps = int(abs(distance) / 50.0) + 2.0
         step_value = float(distance) / total_steps
@@ -1072,7 +1083,9 @@ def slow_scroll_to_element(driver, element, browser):
             scroll_script = "window.scrollTo(0, %s);" % new_position
             driver.execute_script(scroll_script)
     time.sleep(0.01)
-    scroll_script = "window.scrollTo(0, %s);" % element_location
+    scroll_script = "window.scrollTo(%s, %s);" % (
+        element_location_x_fix, element_location_y
+    )
     driver.execute_script(scroll_script)
     time.sleep(0.01)
     if distance > 430 or distance < -300: