seleniumbase 4.27.5__py3-none-any.whl → 4.28.0__py3-none-any.whl

seleniumbase/fixtures/base_case.py

@@ -1251,9 +1251,17 @@ class BaseCase(unittest.TestCase):
         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 @@ class BaseCase(unittest.TestCase):
         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 @@ class BaseCase(unittest.TestCase):
             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 @@ class BaseCase(unittest.TestCase):
         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,
@@ -3728,15 +3738,11 @@ class BaseCase(unittest.TestCase):
         """Opens a new browser tab/window and switches to it by default."""
         self.wait_for_ready_state_complete()
         if switch_to:
-            if self.undetectable:
-                self.driver.execute_script("window.open('data:,');")
+            try:
+                self.driver.switch_to.new_window("tab")
+            except Exception:
+                self.driver.execute_script("window.open('');")
                 self.switch_to_newest_window()
-            else:
-                try:
-                    self.driver.switch_to.new_window("tab")
-                except Exception:
-                    self.driver.execute_script("window.open('');")
-                    self.switch_to_newest_window()
         else:
             self.driver.execute_script("window.open('');")
         time.sleep(0.01)
@@ -4166,6 +4172,14 @@ class BaseCase(unittest.TestCase):
                 self.connect = new_driver.connect
             if hasattr(new_driver, "uc_click"):
                 self.uc_click = new_driver.uc_click
+            if hasattr(new_driver, "uc_gui_press_key"):
+                self.uc_gui_press_key = new_driver.uc_gui_press_key
+            if hasattr(new_driver, "uc_gui_press_keys"):
+                self.uc_gui_press_keys = new_driver.uc_gui_press_keys
+            if hasattr(new_driver, "uc_gui_write"):
+                self.uc_gui_write = new_driver.uc_gui_write
+            if hasattr(new_driver, "uc_gui_handle_cf"):
+                self.uc_gui_handle_cf = new_driver.uc_gui_handle_cf
             if hasattr(new_driver, "uc_switch_to_frame"):
                 self.uc_switch_to_frame = new_driver.uc_switch_to_frame
         return new_driver
@@ -6808,9 +6822,11 @@ class BaseCase(unittest.TestCase):
                     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"
@@ -13681,23 +13697,95 @@ class BaseCase(unittest.TestCase):
                 pass  # JQuery probably couldn't load. Skip highlighting.
         time.sleep(0.065)
 
+    def __activate_standard_virtual_display(self):
+        from sbvirtualdisplay import Display
+        width = settings.HEADLESS_START_WIDTH
+        height = settings.HEADLESS_START_HEIGHT
+        try:
+            self._xvfb_display = Display(
+                visible=0, size=(width, height)
+            )
+            self._xvfb_display.start()
+            sb_config._virtual_display = self._xvfb_display
+            self.headless_active = True
+            sb_config.headless_active = True
+        except Exception:
+            pass
+
     def __activate_virtual_display_as_needed(self):
         """Should be needed only on Linux.
         The "--xvfb" arg is still useful, as it prevents headless mode,
         which is the default mode on Linux unless using another arg."""
         if "linux" in sys.platform and (not self.headed or self.xvfb):
-            width = settings.HEADLESS_START_WIDTH
-            height = settings.HEADLESS_START_HEIGHT
-            try:
-                from sbvirtualdisplay import Display
-
-                self._xvfb_display = Display(visible=0, size=(width, height))
-                self._xvfb_display.start()
-                sb_config._virtual_display = self._xvfb_display
-                self.headless_active = True
-                sb_config.headless_active = True
-            except Exception:
-                pass
+            from sbvirtualdisplay import Display
+            if self.undetectable and not (self.headless or self.headless2):
+                import Xlib.display
+                try:
+                    self._xvfb_display = Display(
+                        visible=True,
+                        size=(1366, 768),
+                        backend="xvfb",
+                        use_xauth=True,
+                    )
+                    self._xvfb_display.start()
+                    if "DISPLAY" not in os.environ.keys():
+                        print("\nX11 display failed! Will use regular xvfb!")
+                        self.__activate_standard_virtual_display()
+                except Exception as e:
+                    if hasattr(e, "msg"):
+                        print("\n" + str(e.msg))
+                    else:
+                        print(e)
+                    print("\nX11 display failed! Will use regular xvfb!")
+                    self.__activate_standard_virtual_display()
+                    return
+                pip_find_lock = fasteners.InterProcessLock(
+                    constants.PipInstall.FINDLOCK
+                )
+                with pip_find_lock:  # Prevent issues with multiple processes
+                    pyautogui_is_installed = False
+                    try:
+                        import pyautogui
+                        try:
+                            use_pyautogui_ver = constants.PyAutoGUI.VER
+                            if pyautogui.__version__ != use_pyautogui_ver:
+                                del pyautogui  # To get newer ver
+                                shared_utils.pip_install(
+                                    "pyautogui", version=use_pyautogui_ver
+                                )
+                                import pyautogui
+                        except Exception:
+                            pass
+                        pyautogui_is_installed = True
+                    except Exception:
+                        message = (
+                            "PyAutoGUI is required for UC Mode on Linux! "
+                            "Installing now..."
+                        )
+                        print("\n" + message)
+                        shared_utils.pip_install(
+                            "pyautogui", version=constants.PyAutoGUI.VER
+                        )
+                        import pyautogui
+                        pyautogui_is_installed = True
+                    if (
+                        pyautogui_is_installed
+                        and hasattr(pyautogui, "_pyautogui_x11")
+                    ):
+                        try:
+                            pyautogui._pyautogui_x11._display = (
+                                Xlib.display.Display(os.environ['DISPLAY'])
+                            )
+                            sb_config._pyautogui_x11_display = (
+                                pyautogui._pyautogui_x11._display
+                            )
+                        except Exception as e:
+                            if hasattr(e, "msg"):
+                                print("\n" + str(e.msg))
+                            else:
+                                print(e)
+            else:
+                self.__activate_standard_virtual_display()
 
     def __ad_block_as_needed(self):
         """This is an internal method for handling ad-blocking.
@@ -15898,7 +15986,7 @@ class BaseCase(unittest.TestCase):
         if self.undetectable:
             try:
                 self.driver.window_handles
-            except urllib3.exceptions.MaxRetryError:
+            except Exception:
                 self.driver.connect()
         self.__slow_mode_pause_if_active()
         has_exception = self.__has_exception()

seleniumbase/fixtures/constants.py

@@ -164,6 +164,7 @@ class MultiBrowser:
     CERT_FIXING_LOCK = Files.DOWNLOADS_FOLDER + "/cert_fixing.lock"
     DOWNLOAD_FILE_LOCK = Files.DOWNLOADS_FOLDER + "/downloading.lock"
     FILE_IO_LOCK = Files.DOWNLOADS_FOLDER + "/file_io.lock"
+    PYAUTOGUILOCK = Files.DOWNLOADS_FOLDER + "/pyautogui.lock"
 
 
 class SavedCookies:
@@ -354,6 +355,11 @@ class SeleniumWire:
     BLINKER_VER = "1.7.0"  # The "blinker" dependency version
 
 
+class PyAutoGUI:
+    # The version installed if PyAutoGUI is not installed
+    VER = "0.9.54"
+
+
 class Mobile:
     # Default values for mobile settings
     WIDTH = 390

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/js_code/active_css_js.py

@@ -103,7 +103,7 @@ function hasDigit(str) {
     return /\d/.test(str);
 };
 function isGen(str) {
-    return /[_-]\d/.test(str);
+    return /[_-]\d/.test(str) || /\d[a-z]/.test(str);
 };
 function tagName(el) {
     return el.tagName.toLowerCase();

seleniumbase/js_code/recorder_js.py

@@ -103,7 +103,7 @@ function hasDigit(str) {
     return /\d/.test(str);
 };
 function isGen(str) {
-    return /[_-]\d/.test(str);
+    return /[_-]\d/.test(str) || /\d[a-z]/.test(str);
 };
 function tagName(el) {
     return el.tagName.toLowerCase();

seleniumbase/plugins/driver_manager.py

@@ -36,6 +36,7 @@ driver.get("https://google.com/ncr")
 
 ###########################################################################
 """
+import os
 import sys
 
 
@@ -124,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".
 ):
@@ -246,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
@@ -328,37 +332,6 @@ def Driver(
     ):
         recorder_mode = True
         recorder_ext = True
-    if headed is None:
-        # Override the default headless mode on Linux if set.
-        if "--gui" in sys_argv or "--headed" in sys_argv:
-            headed = True
-        else:
-            headed = False
-    if (
-        shared_utils.is_linux()
-        and not headed
-        and not headless
-        and not headless2
-    ):
-        headless = True
-    if recorder_mode and headless:
-        headless = False
-        headless2 = True
-    if headless2 and browser == "firefox":
-        headless2 = False  # Only for Chromium browsers
-        headless = True  # Firefox has regular headless
-    elif browser not in ["chrome", "edge"]:
-        headless2 = False  # Only for Chromium browsers
-    if disable_csp is None:
-        disable_csp = False
-    if (
-        (enable_ws is None and disable_ws is None)
-        or (disable_ws is not None and not disable_ws)
-        or (enable_ws is not None and enable_ws)
-    ):
-        enable_ws = True
-    else:
-        enable_ws = False
     if (
         undetectable
         or undetected
@@ -414,6 +387,50 @@ def Driver(
         uc_cdp_events = True
     else:
         uc_cdp_events = False
+    if undetectable and browser != "chrome":
+        message = (
+            '\n  Undetected-Chromedriver Mode ONLY supports Chrome!'
+            '\n  ("uc=True" / "undetectable=True" / "--uc")'
+            '\n  (Your browser choice was: "%s".)'
+            '\n  (Will use "%s" without UC Mode.)\n' % (browser, browser)
+        )
+        print(message)
+    if headed is None:
+        # Override the default headless mode on Linux if set.
+        if "--gui" in sys_argv or "--headed" in sys_argv:
+            headed = True
+        else:
+            headed = False
+    if (
+        shared_utils.is_linux()
+        and not headed
+        and not headless
+        and not headless2
+        and (
+            not undetectable
+            or "DISPLAY" not in os.environ.keys()
+            or not os.environ["DISPLAY"]
+        )
+    ):
+        headless = True
+    if recorder_mode and headless:
+        headless = False
+        headless2 = True
+    if headless2 and browser == "firefox":
+        headless2 = False  # Only for Chromium browsers
+        headless = True  # Firefox has regular headless
+    elif browser not in ["chrome", "edge"]:
+        headless2 = False  # Only for Chromium browsers
+    if disable_csp is None:
+        disable_csp = False
+    if (
+        (enable_ws is None and disable_ws is None)
+        or (disable_ws is not None and not disable_ws)
+        or (enable_ws is not None and enable_ws)
+    ):
+        enable_ws = True
+    else:
+        enable_ws = False
     if log_cdp_events is None and log_cdp is None:
         if (
             "--log-cdp-events" in sys_argv

seleniumbase/plugins/pytest_plugin.py

@@ -1703,14 +1703,17 @@ def pytest_configure(config):
         and not sb_config.headless2
         and not sb_config.xvfb
     ):
-        print(
-            "(Linux uses --headless by default. "
-            "To override, use --headed / --gui. "
-            "For Xvfb mode instead, use --xvfb. "
-            "Or you can hide this info by using "
-            "--headless / --headless2.)"
-        )
-        sb_config.headless = True
+        if not sb_config.undetectable:
+            print(
+                "(Linux uses --headless by default. "
+                "To override, use --headed / --gui. "
+                "For Xvfb mode instead, use --xvfb. "
+                "Or you can hide this info by using "
+                "--headless / --headless2 / --uc.)"
+            )
+            sb_config.headless = True
+        else:
+            sb_config.xvfb = True
 
     # Recorder Mode can still optimize scripts in --headless2 mode.
     if sb_config.recorder_mode and sb_config.headless:

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:
@@ -386,6 +389,69 @@ def SB(
     if not shared_utils.is_linux():
         # The Xvfb virtual display server is for Linux OS Only!
         xvfb = False
+    if (
+        undetectable
+        or undetected
+        or uc
+        or uc_cdp_events
+        or uc_cdp
+        or uc_subprocess
+        or uc_sub
+    ):
+        undetectable = True
+    if (
+        (undetectable or undetected or uc)
+        and (uc_subprocess is None)
+        and (uc_sub is None)
+    ):
+        uc_subprocess = True  # Use UC as a subprocess by default.
+    elif (
+        "--undetectable" in sys_argv
+        or "--undetected" in sys_argv
+        or "--uc" in sys_argv
+        or "--uc-cdp-events" in sys_argv
+        or "--uc_cdp_events" in sys_argv
+        or "--uc-cdp" in sys_argv
+        or "--uc-subprocess" in sys_argv
+        or "--uc_subprocess" in sys_argv
+        or "--uc-sub" in sys_argv
+    ):
+        undetectable = True
+        if uc_subprocess is None and uc_sub is None:
+            uc_subprocess = True  # Use UC as a subprocess by default.
+    else:
+        undetectable = False
+    if uc_subprocess or uc_sub:
+        uc_subprocess = True
+    elif (
+        "--uc-subprocess" in sys_argv
+        or "--uc_subprocess" in sys_argv
+        or "--uc-sub" in sys_argv
+    ):
+        uc_subprocess = True
+    else:
+        uc_subprocess = False
+    if uc_cdp_events or uc_cdp:
+        undetectable = True
+        uc_cdp_events = True
+    elif (
+        "--uc-cdp-events" in sys_argv
+        or "--uc_cdp_events" in sys_argv
+        or "--uc-cdp" in sys_argv
+        or "--uc_cdp" in sys_argv
+    ):
+        undetectable = True
+        uc_cdp_events = True
+    else:
+        uc_cdp_events = False
+    if undetectable and browser != "chrome":
+        message = (
+            '\n  Undetected-Chromedriver Mode ONLY supports Chrome!'
+            '\n  ("uc=True" / "undetectable=True" / "--uc")'
+            '\n  (Your browser choice was: "%s".)'
+            '\n  (Will use "%s" without UC Mode.)\n' % (browser, browser)
+        )
+        print(message)
     if headed is None:
         # Override the default headless mode on Linux if set.
         if "--gui" in sys_argv or "--headed" in sys_argv:
@@ -399,7 +465,10 @@ def SB(
         and not headless2
         and not xvfb
     ):
-        headless = True
+        if not undetectable:
+            headless = True
+        else:
+            xvfb = True
     if headless2 and browser == "firefox":
         headless2 = False  # Only for Chromium browsers
         headless = True  # Firefox has regular headless
@@ -456,61 +525,6 @@ def SB(
     else:
         enable_ws = False
         disable_ws = True
-    if (
-        undetectable
-        or undetected
-        or uc
-        or uc_cdp_events
-        or uc_cdp
-        or uc_subprocess
-        or uc_sub
-    ):
-        undetectable = True
-    if (
-        (undetectable or undetected or uc)
-        and (uc_subprocess is None)
-        and (uc_sub is None)
-    ):
-        uc_subprocess = True  # Use UC as a subprocess by default.
-    elif (
-        "--undetectable" in sys_argv
-        or "--undetected" in sys_argv
-        or "--uc" in sys_argv
-        or "--uc-cdp-events" in sys_argv
-        or "--uc_cdp_events" in sys_argv
-        or "--uc-cdp" in sys_argv
-        or "--uc-subprocess" in sys_argv
-        or "--uc_subprocess" in sys_argv
-        or "--uc-sub" in sys_argv
-    ):
-        undetectable = True
-        if uc_subprocess is None and uc_sub is None:
-            uc_subprocess = True  # Use UC as a subprocess by default.
-    else:
-        undetectable = False
-    if uc_subprocess or uc_sub:
-        uc_subprocess = True
-    elif (
-        "--uc-subprocess" in sys_argv
-        or "--uc_subprocess" in sys_argv
-        or "--uc-sub" in sys_argv
-    ):
-        uc_subprocess = True
-    else:
-        uc_subprocess = False
-    if uc_cdp_events or uc_cdp:
-        undetectable = True
-        uc_cdp_events = True
-    elif (
-        "--uc-cdp-events" in sys_argv
-        or "--uc_cdp_events" in sys_argv
-        or "--uc-cdp" in sys_argv
-        or "--uc_cdp" in sys_argv
-    ):
-        undetectable = True
-        uc_cdp_events = True
-    else:
-        uc_cdp_events = False
     if log_cdp_events is None and log_cdp is None:
         if (
             "--log-cdp-events" in sys_argv

seleniumbase/plugins/selenium_plugin.py

@@ -1204,15 +1204,19 @@ class SeleniumBrowser(Plugin):
             and not self.options.headless2
             and not self.options.xvfb
         ):
-            print(
-                "(Linux uses --headless by default. "
-                "To override, use --headed / --gui. "
-                "For Xvfb mode instead, use --xvfb. "
-                "Or you can hide this info by using "
-                "--headless / --headless2.)"
-            )
-            self.options.headless = True
-            test.test.headless = True
+            if not self.options.undetectable:
+                print(
+                    "(Linux uses --headless by default. "
+                    "To override, use --headed / --gui. "
+                    "For Xvfb mode instead, use --xvfb. "
+                    "Or you can hide this info by using "
+                    "--headless / --headless2 / --uc.)"
+                )
+                self.options.headless = True
+                test.test.headless = True
+            else:
+                self.options.xvfb = True
+                test.test.xvfb = True
         if self.options.use_wire and self.options.undetectable:
             print(
                 "\n"