Safari click uses js script for click now

Author: VladimirPodolian

dyatel/abstraction/driver_wrapper_abc.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from abc import ABC
+from functools import cached_property
 from typing import List, Union, Any, Tuple
 
 from dyatel.mixins.objects.cut_box import CutBox
@@ -38,6 +39,33 @@ class DriverWrapperABC(ABC):
 
     browser_name = None
 
+    @cached_property
+    def is_safari(self) -> bool:
+        """
+        Returns the status of whether the current driver is Safari
+
+        :return: :class:`bool`
+        """
+        raise NotImplementedError()
+
+    @cached_property
+    def is_chrome(self) -> bool:
+        """
+        Returns the status of whether the current driver is Chrome
+
+        :return: :class:`bool`
+        """
+        raise NotImplementedError()
+
+    @cached_property
+    def is_firefox(self) -> bool:
+        """
+        Returns the status of whether the current driver is Firefox
+
+        :return: :class:`bool`
+        """
+        raise NotImplementedError()
+
     def quit(self, silent: bool = False, trace_path: str = 'trace.zip'):
         """
         Quit the driver instance

dyatel/base/driver_wrapper.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from functools import cached_property
 from typing import Union, Type, List, Tuple, Any, Optional
 
 from PIL import Image
@@ -154,6 +155,33 @@ def __init__(
             self.is_desktop = False
             self.is_mobile = True
 
+    @cached_property
+    def is_safari(self) -> bool:
+        """
+        Returns the status of whether the current driver is Safari
+
+        :return: :class:`bool`
+        """
+        return self.browser_name.lower() == 'safari'
+
+    @cached_property
+    def is_chrome(self) -> bool:
+        """
+        Returns the status of whether the current driver is Chrome
+
+        :return: :class:`bool`
+        """
+        return self.browser_name.lower() == 'chrome'
+
+    @cached_property
+    def is_firefox(self) -> bool:
+        """
+        Returns the status of whether the current driver is Firefox
+
+        :return: :class:`bool`
+        """
+        return self.browser_name.lower() == 'firefox'
+
     def quit(self, silent: bool = False, trace_path: str = 'trace.zip'):
         """
         Quit the driver instance

dyatel/dyatel_sel/core/core_element.py

@@ -21,7 +21,7 @@
 
 from dyatel.abstraction.element_abc import ElementABC
 from dyatel.dyatel_sel.sel_utils import ActionChains
-from dyatel.js_scripts import get_element_size_js, get_element_position_on_screen_js
+from dyatel.js_scripts import get_element_size_js, get_element_position_on_screen_js, js_click
 from dyatel.keyboard_keys import KeyboardKeys
 from dyatel.mixins.objects.location import Location
 from dyatel.mixins.objects.scrolls import ScrollTo, ScrollTypes, scroll_into_view_blocks
@@ -102,7 +102,13 @@ def click(self, force_wait: bool = True, *args, **kwargs) -> CoreElement:
         start_time = time.time()
         while time.time() - start_time < HALF_WAIT_EL:
             try:
-                self.wait_enabled(silent=True).element.click()
+                element = self.wait_enabled(silent=True).element
+
+                if self.driver_wrapper.is_safari:
+                    self.execute_script(js_click)
+                else:
+                    element.click()
+
                 return self
             except (
                     SeleniumElementNotInteractableException,
@@ -359,7 +365,7 @@ def text(self) -> str:
         """
         element = self._get_element(wait=self.wait_availability)
 
-        if self.driver_wrapper.browser_name.lower() == 'safari':
+        if self.driver_wrapper.is_safari:
             return element.get_attribute('innerText')
 
         return element.text

dyatel/js_scripts.py

@@ -1,5 +1,6 @@
 get_inner_height_js = 'return window.innerHeight'
 get_inner_width_js = 'return window.innerWidth'
+js_click = 'arguments[0].click();'
 
 get_element_position_on_screen_js = """
 function getPositionOnScreen(elem) {