Refactoring

Author: mdmintz

seleniumbase/__init__.py

@@ -1,4 +1,5 @@
 import collections
+import os
 import pdb
 try:
     import pdbp  # (Pdb+) --- Python Debugger Plus
@@ -34,11 +35,13 @@
         pdb.DefaultConfig.truncate_long_lines = False
         pdb.DefaultConfig.sticky_by_default = True
 colored_traceback.add_hook()
+os.environ["SE_AVOID_STATS"] = "true"  # Disable Selenium Manager stats
 if sys.version_info >= (3, 7):
     webdriver.TouchActions = None  # Lifeline for past selenium-wire versions
 if sys.version_info >= (3, 10):
     collections.Callable = collections.abc.Callable  # Lifeline for nosetests
 del collections  # Undo "import collections" / Simplify "dir(seleniumbase)"
+del os  # Undo "import os" / Simplify "dir(seleniumbase)"
 del sys  # Undo "import sys" / Simplify "dir(seleniumbase)"
 del webdriver  # Undo "import webdriver" / Simplify "dir(seleniumbase)"
 

seleniumbase/core/browser_launcher.py

@@ -1007,7 +1007,7 @@ def _set_chrome_options(
     prefs["download.prompt_for_download"] = False
     prefs["credentials_enable_service"] = False
     prefs["local_discovery.notifications_enabled"] = False
-    prefs["safebrowsing.enabled"] = False
+    prefs["safebrowsing.enabled"] = False  # Prevent PW "data breach" pop-ups
     prefs["safebrowsing.disable_download_protection"] = True
     prefs["omnibox-max-zero-suggest-matches"] = 0
     prefs["omnibox-use-existing-autocomplete-client"] = 0
@@ -1534,7 +1534,7 @@ def _set_firefox_options(
                     f_pref_value = False
                 elif f_pref_value.isdigit():
                     f_pref_value = int(f_pref_value)
-                elif f_pref_value.isdecimal():
+                elif f_pref_value.replace(".", "", 1).isdigit():
                     f_pref_value = float(f_pref_value)
                 else:
                     pass  # keep as string
@@ -2598,7 +2598,7 @@ def get_local_driver(
             "credentials_enable_service": False,
             "local_discovery.notifications_enabled": False,
             "safebrowsing.disable_download_protection": True,
-            "safebrowsing.enabled": False,
+            "safebrowsing.enabled": False,  # Prevent PW "data breach" pop-ups
             "omnibox-max-zero-suggest-matches": 0,
             "omnibox-use-existing-autocomplete-client": 0,
             "omnibox-trending-zero-prefix-suggestions-on-ntp": 0,

seleniumbase/fixtures/base_case.py

@@ -1251,9 +1251,17 @@ def focus(self, selector, by="css selector", timeout=None):
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
         selector, by = self.__recalculate_selector(selector, by)
-        element = self.wait_for_element_visible(
+        element = self.wait_for_element_present(
             selector, by=by, timeout=timeout
         )
+        if not element.is_displayed():
+            css_selector = self.convert_to_css_selector(selector, by=by)
+            css_selector = re.escape(css_selector)  # Add "\\" to special chars
+            css_selector = self.__escape_quotes_if_needed(css_selector)
+            script = """document.querySelector('%s').focus();""" % css_selector
+            self.execute_script(script)
+            self.__demo_mode_pause_if_active()
+            return
         self.scroll_to(selector, by=by, timeout=timeout)
         try:
             element.send_keys(Keys.NULL)
@@ -1828,7 +1836,7 @@ def click_partial_link_text(self, partial_link_text, timeout=None):
         elif self.slow_mode:
             self.__slow_mode_pause_if_active()
 
-    def get_text(self, selector, by="css selector", timeout=None):
+    def get_text(self, selector="html", by="css selector", timeout=None):
         self.__check_scope()
         if not timeout:
             timeout = settings.LARGE_TIMEOUT
@@ -2083,7 +2091,9 @@ def get_property(
             return ""
         return property_value
 
-    def get_text_content(self, selector, by="css selector", timeout=None):
+    def get_text_content(
+        self, selector="html", by="css selector", timeout=None
+    ):
         """Returns the text that appears in the HTML for an element.
         This is different from "self.get_text(selector, by="css selector")"
         because that only returns the visible text on a page for an element,
@@ -3401,7 +3411,7 @@ def maximize_window(self):
         self.driver.maximize_window()
         self.__demo_mode_pause_if_active()
 
-    def switch_to_frame(self, frame, timeout=None):
+    def switch_to_frame(self, frame="iframe", timeout=None):
         """Wait for an iframe to appear, and switch to it. This should be
         usable as a drop-in replacement for driver.switch_to.frame().
         The iframe identifier can be a selector, an index, an id, a name,
@@ -6812,9 +6822,11 @@ def get_pdf_text(
                     try:
                         import cryptography
                         if cryptography.__version__ != "39.0.2":
+                            del cryptography  # To get newer ver
                             shared_utils.pip_install(
                                 "cryptography", version="39.0.2"
                             )
+                            import cryptography
                     except Exception:
                         shared_utils.pip_install(
                             "cryptography", version="39.0.2"

seleniumbase/fixtures/page_actions.py

@@ -1017,7 +1017,7 @@ def wait_for_element_not_visible(
 def wait_for_text_not_visible(
     driver,
     text,
-    selector,
+    selector="html",
     by="css selector",
     timeout=settings.LARGE_TIMEOUT,
 ):
@@ -1060,7 +1060,7 @@ def wait_for_text_not_visible(
 def wait_for_exact_text_not_visible(
     driver,
     text,
-    selector,
+    selector="html",
     by="css selector",
     timeout=settings.LARGE_TIMEOUT,
 ):
@@ -1686,19 +1686,50 @@ def assert_text(
     by="css selector",
     timeout=settings.SMALL_TIMEOUT,
 ):
+    selector, by = page_utils.recalculate_selector(selector, by)
     wait_for_text_visible(
         driver, text.strip(), selector, by=by, timeout=timeout
     )
 
 
 def assert_exact_text(
-    driver, text, selector, by="css selector", timeout=settings.SMALL_TIMEOUT
+    driver,
+    text,
+    selector="html",
+    by="css selector",
+    timeout=settings.SMALL_TIMEOUT,
 ):
+    selector, by = page_utils.recalculate_selector(selector, by)
     wait_for_exact_text_visible(
         driver, text.strip(), selector, by=by, timeout=timeout
     )
 
 
+def assert_non_empty_text(
+    driver,
+    selector,
+    by="css selector",
+    timeout=settings.SMALL_TIMEOUT,
+):
+    selector, by = page_utils.recalculate_selector(selector, by)
+    wait_for_non_empty_text_visible(
+        driver, selector, by=by, timeout=timeout
+    )
+
+
+def assert_text_not_visible(
+    driver,
+    text,
+    selector="html",
+    by="css selector",
+    timeout=settings.SMALL_TIMEOUT,
+):
+    selector, by = page_utils.recalculate_selector(selector, by)
+    wait_for_text_not_visible(
+        driver, text.strip(), selector, by=by, timeout=timeout
+    )
+
+
 def wait_for_element(
     driver,
     selector,
@@ -1748,6 +1779,7 @@ def wait_for_text(
     by="css selector",
     timeout=settings.LARGE_TIMEOUT,
 ):
+    selector, by = page_utils.recalculate_selector(selector, by)
     return wait_for_text_visible(
         driver=driver,
         text=text,
@@ -1764,6 +1796,7 @@ def wait_for_exact_text(
     by="css selector",
     timeout=settings.LARGE_TIMEOUT,
 ):
+    selector, by = page_utils.recalculate_selector(selector, by)
     return wait_for_exact_text_visible(
         driver=driver,
         text=text,
@@ -1779,6 +1812,7 @@ def wait_for_non_empty_text(
     by="css selector",
     timeout=settings.LARGE_TIMEOUT,
 ):
+    selector, by = page_utils.recalculate_selector(selector, by)
     return wait_for_non_empty_text_visible(
         driver=driver,
         selector=selector,

seleniumbase/plugins/driver_manager.py

@@ -125,6 +125,7 @@ def Driver(
     uc_cdp=None,  # Shortcut / Duplicate of "uc_cdp_events".
     uc_sub=None,  # Shortcut / Duplicate of "uc_subprocess".
     log_cdp=None,  # Shortcut / Duplicate of "log_cdp_events".
+    server=None,  # Shortcut / Duplicate of "servername".
     wire=None,  # Shortcut / Duplicate of "use_wire".
     pls=None,  # Shortcut / Duplicate of "page_load_strategy".
 ):
@@ -247,6 +248,8 @@ def Driver(
             headless2 = False
     if protocol is None:
         protocol = "http"  # For the Selenium Grid only!
+    if server is not None and servername is None:
+        servername = server
     if servername is None:
         servername = "localhost"  # For the Selenium Grid only!
     use_grid = False

seleniumbase/plugins/sb_manager.py

@@ -103,6 +103,7 @@ def SB(
     uc_cdp=None,  # Shortcut / Duplicate of "uc_cdp_events".
     uc_sub=None,  # Shortcut / Duplicate of "uc_subprocess".
     log_cdp=None,  # Shortcut / Duplicate of "log_cdp_events".
+    server=None,  # Shortcut / Duplicate of "servername".
     wire=None,  # Shortcut / Duplicate of "use_wire".
     pls=None,  # Shortcut / Duplicate of "page_load_strategy".
     sjw=None,  # Shortcut / Duplicate of "skip_js_waits".
@@ -282,6 +283,8 @@ def SB(
             headless2 = False
     if protocol is None:
         protocol = "http"  # For the Selenium Grid only!
+    if server is not None and servername is None:
+        servername = server
     if servername is None:
         servername = "localhost"  # For the Selenium Grid only!
     if port is None: