Merge pull request #1372 from seleniumbase/selenium-upgrade

Selenium upgrade

Author: mdmintz

examples/test_canvas.py

@@ -18,7 +18,16 @@ def get_pixel_colors(self):
         else:
             return [color["0"], color["1"], color["2"]]
 
-    def test_canvas_actions(self):
+    def test_canvas_click_from_center(self):
+        self.open("https://seleniumbase.io/other/canvas")
+        self.click_with_offset("canvas", 0, 0, center=True)
+        self.sleep(1)  # Not needed (Lets you see the alert pop up)
+        alert = self.switch_to_alert()
+        self.assert_equal(alert.text, "You clicked on the square!")
+        self.accept_alert()
+        self.sleep(1)  # Not needed (Lets you see the alert go away)
+
+    def test_click_with_offset(self):
         self.open("https://seleniumbase.io/canvas/")
         self.highlight("canvas")
         rgb = self.get_pixel_colors()
@@ -27,12 +36,3 @@ def test_canvas_actions(self):
         self.highlight("canvas", loops=5)
         rgb = self.get_pixel_colors()
         self.assert_equal(rgb, [39, 42, 56])  # Blue by hamburger
-
-    def test_canvas_click(self):
-        self.open("https://seleniumbase.io/other/canvas")
-        self.click_with_offset("canvas", 300, 200)
-        self.sleep(1)  # Not needed (Lets you see the alert pop up)
-        alert = self.switch_to_alert()
-        self.assert_equal(alert.text, "You clicked on the square!")
-        self.accept_alert()
-        self.sleep(1)  # Not needed (Lets you see the alert go away)

help_docs/method_summary.md

@@ -129,10 +129,10 @@ self.click_if_visible(selector, by="css selector")
 self.click_active_element()
 
 self.click_with_offset(
-    selector, x, y, by="css selector", mark=None, timeout=None)
+    selector, x, y, by="css selector", mark=None, timeout=None, center=None)
 
 self.double_click_with_offset(
-    selector, x, y, by="css selector", mark=None, timeout=None)
+    selector, x, y, by="css selector", mark=None, timeout=None, center=None)
 
 self.is_selected(selector, by="css selector", timeout=None)
 # Duplicates: self.is_checked(selector, by="css selector", timeout=None)

requirements.txt

@@ -49,7 +49,7 @@ trio-websocket==0.9.2;python_version>="3.7"
 pyopenssl==22.0.0;python_version>="3.7"
 wsproto==1.1.0;python_version>="3.7"
 selenium==3.141.0;python_version<"3.7"
-selenium==4.2.0;python_version>="3.7"
+selenium==4.3.0;python_version>="3.7"
 msedge-selenium-tools==3.141.3;python_version<"3.7"
 more-itertools==5.0.0;python_version<"3.5"
 more-itertools==8.13.0;python_version>="3.5"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "3.2.12"
+__version__ = "3.3.0"

seleniumbase/fixtures/base_case.py

@@ -78,9 +78,9 @@ def test_anything(self):
     python3 = False
     reload(sys)  # noqa: F821
     sys.setdefaultencoding("utf8")
-selenium4 = False
+selenium4_or_newer = False
 if sys.version_info >= (3, 7):
-    selenium4 = True
+    selenium4_or_newer = True
 
 
 class BaseCase(unittest.TestCase):
@@ -1782,31 +1782,61 @@ def click_active_element(self):
             self.__slow_mode_pause_if_active()
 
     def click_with_offset(
-        self, selector, x, y, by="css selector", mark=None, timeout=None
+        self,
+        selector,
+        x,
+        y,
+        by="css selector",
+        mark=None,
+        timeout=None,
+        center=None,
     ):
         """
         Click an element at an {X,Y}-offset location.
         {0,0} is the top-left corner of the element.
+        If center==True, {0,0} becomes the center of the element.
         If mark==True, will draw a dot at location. (Useful for debugging)
         In Demo Mode, mark becomes True unless set to False. (Default: None)
         """
         self.__check_scope()
         self.__click_with_offset(
-            selector, x, y, by=by, double=False, mark=mark, timeout=timeout
+            selector,
+            x,
+            y,
+            by=by,
+            double=False,
+            mark=mark,
+            timeout=timeout,
+            center=center,
         )
 
     def double_click_with_offset(
-        self, selector, x, y, by="css selector", mark=None, timeout=None
+        self,
+        selector,
+        x,
+        y,
+        by="css selector",
+        mark=None,
+        timeout=None,
+        center=None,
     ):
         """
         Double click an element at an {X,Y}-offset location.
         {0,0} is the top-left corner of the element.
+        If center==True, {0,0} becomes the center of the element.
         If mark==True, will draw a dot at location. (Useful for debugging)
         In Demo Mode, mark becomes True unless set to False. (Default: None)
         """
         self.__check_scope()
         self.__click_with_offset(
-            selector, x, y, by=by, double=True, mark=mark, timeout=timeout
+            selector,
+            x,
+            y,
+            by=by,
+            double=True,
+            mark=mark,
+            timeout=timeout,
+            center=center,
         )
 
     def is_checked(self, selector, by="css selector", timeout=None):
@@ -6492,7 +6522,7 @@ def __get_shadow_element(
         for selector_part in selectors[1:]:
             shadow_root = None
             if (
-                selenium4
+                selenium4_or_newer
                 and self.is_chromium()
                 and int(self.__get_major_browser_version()) >= 96
             ):
@@ -6562,7 +6592,7 @@ def __get_shadow_element(
             selector_chain += selector_part
             try:
                 if (
-                    selenium4
+                    selenium4_or_newer
                     and self.is_chromium()
                     and int(self.__get_major_browser_version()) >= 96
                 ):
@@ -11382,6 +11412,7 @@ def __click_with_offset(
         double=False,
         mark=None,
         timeout=None,
+        center=None,
     ):
         from selenium.webdriver.common.action_chains import ActionChains
 
@@ -11406,8 +11437,16 @@ def __click_with_offset(
             selector = self.convert_to_css_selector(selector, by=by)
             selector = re.escape(selector)
             selector = self.__escape_quotes_if_needed(selector)
-            px = x - 3
-            py = y - 3
+            m_x = x
+            m_y = y
+            if center:
+                element_rect = element.rect
+                left_offset = element_rect['width'] / 2
+                top_offset = element_rect['height'] / 2
+                m_x = left_offset + (m_x or 0)
+                m_y = top_offset + (m_y or 0)
+            px = m_x - 3
+            py = m_y - 3
             script = (
                 "var canvas = document.querySelector('%s');"
                 "var ctx = canvas.getContext('2d');"
@@ -11428,12 +11467,25 @@ def __click_with_offset(
         except Exception:
             pass
         try:
+            if selenium4_or_newer and not center:
+                element_rect = element.rect
+                left_offset = element_rect['width'] / 2
+                top_offset = element_rect['height'] / 2
+                x = -left_offset + (x or 0)
+                y = -top_offset + (y or 0)
+            elif selenium4_or_newer and center:
+                pass
+            elif not selenium4_or_newer and not center:
+                pass
+            else:
+                # not selenium4_or_newer and center:
+                element_rect = element.rect
+                left_offset = element_rect['width'] / 2
+                top_offset = element_rect['height'] / 2
+                x = left_offset + x
+                y = top_offset + y
             action_chains = ActionChains(self.driver)
-            import warnings
-
-            with warnings.catch_warnings():
-                warnings.simplefilter("ignore", category=DeprecationWarning)
-                action_chains.move_to_element_with_offset(element, x, y)
+            action_chains.move_to_element_with_offset(element, x, y)
             if not double:
                 action_chains.click().perform()
             else:

setup.py

@@ -174,7 +174,7 @@
         'pyopenssl==22.0.0;python_version>="3.7"',
         'wsproto==1.1.0;python_version>="3.7"',
         'selenium==3.141.0;python_version<"3.7"',
-        'selenium==4.2.0;python_version>="3.7"',
+        'selenium==4.3.0;python_version>="3.7"',
         'msedge-selenium-tools==3.141.3;python_version<"3.7"',
         'more-itertools==5.0.0;python_version<"3.5"',
         'more-itertools==8.13.0;python_version>="3.5"',