Better compatibility when running automation on Safari

Author: mdmintz

seleniumbase/fixtures/base_case.py

@@ -1245,13 +1245,17 @@ def get_text(self, selector, by=By.CSS_SELECTOR, timeout=None):
         )
         try:
             element_text = element.text
+            if self.browser == "safari":
+                element_text = element.get_attribute("innerText")
         except (StaleElementReferenceException, ENI_Exception):
             self.wait_for_ready_state_complete()
             time.sleep(0.14)
             element = page_actions.wait_for_element_visible(
                 self.driver, selector, by, timeout
             )
             element_text = element.text
+            if self.browser == "safari":
+                element_text = element.get_attribute("innerText")
         return element_text
 
     def get_attribute(
@@ -6214,6 +6218,11 @@ def __is_shadow_element_enabled(self, selector):
     def __is_shadow_text_visible(self, text, selector):
         try:
             element = self.__get_shadow_element(selector, timeout=0.1)
+            if self.browser == "safari":
+                return (
+                    element.is_displayed()
+                    and text in element.get_attribute("innerText")
+                )
             return element.is_displayed() and text in element.text
         except Exception:
             return False
@@ -9243,7 +9252,7 @@ def wait_for_text_visible(
                 text, selector, timeout
             )
         return page_actions.wait_for_text_visible(
-            self.driver, text, selector, by, timeout
+            self.driver, text, selector, by, timeout, self.browser
         )
 
     def wait_for_exact_text_visible(
@@ -9260,7 +9269,7 @@ def wait_for_exact_text_visible(
                 text, selector, timeout
             )
         return page_actions.wait_for_exact_text_visible(
-            self.driver, text, selector, by, timeout
+            self.driver, text, selector, by, timeout, self.browser
         )
 
     def wait_for_text(

seleniumbase/fixtures/page_actions.py

@@ -31,6 +31,7 @@
 from selenium.common.exceptions import NoSuchFrameException
 from selenium.common.exceptions import NoSuchWindowException
 from selenium.common.exceptions import StaleElementReferenceException
+from selenium.common.exceptions import TimeoutException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.action_chains import ActionChains
 from seleniumbase.config import settings
@@ -384,7 +385,12 @@ def wait_for_element_visible(
 
 
 def wait_for_text_visible(
-    driver, text, selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT
+    driver,
+    text,
+    selector,
+    by=By.CSS_SELECTOR,
+    timeout=settings.LARGE_TIMEOUT,
+    browser=None
 ):
     """
     Searches for the specified element by the given selector. Returns the
@@ -412,11 +418,21 @@ def wait_for_text_visible(
         try:
             element = driver.find_element(by=by, value=selector)
             is_present = True
-            if element.is_displayed() and text in element.text:
-                return element
+            if browser == "safari":
+                if (
+                    element.is_displayed()
+                    and text in element.get_attribute("innerText")
+                ):
+                    return element
+                else:
+                    element = None
+                    raise Exception()
             else:
-                element = None
-                raise Exception()
+                if element.is_displayed() and text in element.text:
+                    return element
+                else:
+                    element = None
+                    raise Exception()
         except Exception:
             now_ms = time.time() * 1000.0
             if now_ms >= stop_ms:
@@ -443,7 +459,12 @@ def wait_for_text_visible(
 
 
 def wait_for_exact_text_visible(
-    driver, text, selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT
+    driver,
+    text,
+    selector,
+    by=By.CSS_SELECTOR,
+    timeout=settings.LARGE_TIMEOUT,
+    browser=None
 ):
     """
     Searches for the specified element by the given selector. Returns the
@@ -471,11 +492,25 @@ def wait_for_exact_text_visible(
         try:
             element = driver.find_element(by=by, value=selector)
             is_present = True
-            if element.is_displayed() and text.strip() == element.text.strip():
-                return element
+            if browser == "safari":
+                if (
+                    element.is_displayed()
+                    and text.strip() == element.get_attribute(
+                        "innerText").strip()
+                ):
+                    return element
+                else:
+                    element = None
+                    raise Exception()
             else:
-                element = None
-                raise Exception()
+                if (
+                    element.is_displayed()
+                    and text.strip() == element.text.strip()
+                ):
+                    return element
+                else:
+                    element = None
+                    raise Exception()
         except Exception:
             now_ms = time.time() * 1000.0
             if now_ms >= stop_ms:
@@ -958,7 +993,7 @@ def switch_to_frame(driver, frame, timeout=settings.SMALL_TIMEOUT):
         try:
             driver.switch_to.frame(frame)
             return True
-        except NoSuchFrameException:
+        except (NoSuchFrameException, TimeoutException):
             if type(frame) is str:
                 by = None
                 if page_utils.is_xpath_selector(frame):