seleniumbase 4.33.15__tar.gz → 4.33.16a0__tar.gz

{seleniumbase-4.33.15/seleniumbase.egg-info → seleniumbase-4.33.16a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: seleniumbase
-Version: 4.33.15
+Version: 4.33.16a0
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -68,8 +68,9 @@ Requires-Dist: attrs>=24.3.0
 Requires-Dist: certifi>=2024.12.14
 Requires-Dist: exceptiongroup>=1.2.2
 Requires-Dist: websockets~=13.1; python_version < "3.9"
-Requires-Dist: websockets>=14.1; python_version >= "3.9"
-Requires-Dist: filelock>=3.16.1
+Requires-Dist: websockets>=14.2; python_version >= "3.9"
+Requires-Dist: filelock~=3.16.1; python_version < "3.9"
+Requires-Dist: filelock>=3.17.0; python_version >= "3.9"
 Requires-Dist: fasteners>=0.19
 Requires-Dist: mycdp>=1.1.0
 Requires-Dist: pynose>=1.5.3
@@ -102,7 +103,8 @@ Requires-Dist: trio==0.28.0; python_version >= "3.9"
 Requires-Dist: trio-websocket==0.11.1
 Requires-Dist: wsproto==1.2.0
 Requires-Dist: websocket-client==1.8.0
-Requires-Dist: selenium==4.27.1
+Requires-Dist: selenium==4.27.1; python_version < "3.9"
+Requires-Dist: selenium==4.28.0; python_version >= "3.9"
 Requires-Dist: cssselect==1.2.0
 Requires-Dist: sortedcontainers==2.4.0
 Requires-Dist: execnet==2.1.1

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0}/examples/raw_recaptcha.py

@@ -1,14 +1,5 @@
 from seleniumbase import SB
 
-with SB(uc=True, test=True, incognito=True) as sb:
-    url = "https://seleniumbase.io/apps/recaptcha"
-    sb.activate_cdp_mode(url)
-    sb.sleep(1)
-    sb.uc_gui_handle_captcha()  # Try with TAB + SPACEBAR
-    sb.assert_element("img#captcha-success", timeout=3)
-    sb.set_messenger_theme(location="top_left")
-    sb.post_message("SeleniumBase wasn't detected", duration=3)
-
 with SB(uc=True, test=True, incognito=True) as sb:
     url = "https://seleniumbase.io/apps/recaptcha"
     sb.activate_cdp_mode(url)

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0}/examples/uc_cdp_events.py

@@ -1,6 +1,6 @@
 from rich.pretty import pprint
 from seleniumbase import BaseCase
-BaseCase.main(__name__, __file__, "--uc", "--uc-cdp", "-s")
+BaseCase.main(__name__, __file__, "--uc", "--uc-cdp")
 
 
 class CDPTests(BaseCase):

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0}/examples/verify_undetected.py

@@ -2,7 +2,7 @@
 Some sites use scripts to detect Selenium, and then block you.
 To evade detection, add --uc as a pytest command-line option."""
 from seleniumbase import BaseCase
-BaseCase.main(__name__, __file__, "--uc", "-s")
+BaseCase.main(__name__, __file__, "--uc")
 
 
 class UndetectedTest(BaseCase):

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0}/requirements.txt

@@ -7,8 +7,9 @@ attrs>=24.3.0
 certifi>=2024.12.14
 exceptiongroup>=1.2.2
 websockets~=13.1;python_version<"3.9"
-websockets>=14.1;python_version>="3.9"
-filelock>=3.16.1
+websockets>=14.2;python_version>="3.9"
+filelock~=3.16.1;python_version<"3.9"
+filelock>=3.17.0;python_version>="3.9"
 fasteners>=0.19
 mycdp>=1.1.0
 pynose>=1.5.3
@@ -41,7 +42,8 @@ trio==0.28.0;python_version>="3.9"
 trio-websocket==0.11.1
 wsproto==1.2.0
 websocket-client==1.8.0
-selenium==4.27.1
+selenium==4.27.1;python_version<"3.9"
+selenium==4.28.0;python_version>="3.9"
 cssselect==1.2.0
 sortedcontainers==2.4.0
 execnet==2.1.1

seleniumbase-4.33.16a0/seleniumbase/__version__.py

@@ -0,0 +1,2 @@
+# seleniumbase package
+__version__ = "4.33.16a0"

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0}/seleniumbase/console_scripts/sb_commander.py

@@ -156,9 +156,9 @@ def do_pytest_run(
     if save_screenshots:
         full_run_command += " --screenshot"
 
-    dash_s_needed = False
-    if "-s" not in additional_options.split(" "):
-        dash_s_needed = True
+    capture_needed = False
+    if "--capture" not in additional_options.split(" "):
+        capture_needed = True
 
     additional_options = additional_options.strip()
     if additional_options:
@@ -168,8 +168,8 @@ def do_pytest_run(
     if verbose:
         full_run_command += " -v"
 
-    if dash_s_needed:
-        full_run_command += " -s"
+    if capture_needed:
+        full_run_command += " --capture=tee-sys"
 
     print(full_run_command)
     subprocess.Popen(full_run_command, shell=True)

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0}/seleniumbase/core/browser_launcher.py

@@ -888,6 +888,13 @@ def __install_pyautogui_if_missing():
                     _xvfb_display.start()
                     sb_config._virtual_display = _xvfb_display
                     sb_config.headless_active = True
+                    if (
+                        hasattr(sb_config, "reuse_session")
+                        and sb_config.reuse_session
+                        and hasattr(sb_config, "_vd_list")
+                        and isinstance(sb_config._vd_list, list)
+                    ):
+                        sb_config._vd_list.append(_xvfb_display)
 
 
 def install_pyautogui_if_missing(driver):
@@ -1217,6 +1224,13 @@ def _uc_gui_click_captcha(
                     and driver.is_element_present("#challenge-form div > div")
                 ):
                     frame = "#challenge-form div > div"
+                elif (
+                    driver.is_element_present('[name*="cf-turnstile-"]')
+                    and driver.is_element_present(
+                        '[style="display: grid;"] div div'
+                    )
+                ):
+                    frame = '[style="display: grid;"] div div'
                 elif (
                     driver.is_element_present('[name*="cf-turnstile-"]')
                     and driver.is_element_present("[class*=spacer] + div div")
@@ -3838,6 +3852,12 @@ def get_local_driver(
             edge_options.add_argument("--guest")
         if dark_mode:
             edge_options.add_argument("--enable-features=WebContentsForceDark")
+        if headless1:
+            # developer.chrome.com/blog/removing-headless-old-from-chrome
+            with suppress(Exception):
+                if int(str(use_version).split(".")[0]) >= 132:
+                    headless1 = False
+                    headless2 = True
         if headless2:
             try:
                 if use_version == "latest" or int(use_version) >= 109:
@@ -4379,6 +4399,12 @@ def get_local_driver(
             use_version = find_chromedriver_version_to_use(
                 use_version, driver_version
             )
+            if headless1:
+                # developer.chrome.com/blog/removing-headless-old-from-chrome
+                with suppress(Exception):
+                    if int(str(use_version).split(".")[0]) >= 132:
+                        headless1 = False
+                        headless2 = True
             if headless2:
                 try:
                     if (

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0}/seleniumbase/fixtures/base_case.py

@@ -95,6 +95,7 @@ logging.getLogger("requests").setLevel(logging.ERROR)
 logging.getLogger("urllib3").setLevel(logging.ERROR)
 urllib3.disable_warnings()
 LOGGER.setLevel(logging.WARNING)
+is_linux = shared_utils.is_linux()
 is_windows = shared_utils.is_windows()
 python3_11_or_newer = False
 if sys.version_info >= (3, 11):
@@ -4828,7 +4829,7 @@ class BaseCase(unittest.TestCase):
         from seleniumbase.js_code.recorder_js import recorder_js
 
         if not self.is_chromium():
-            if "linux" not in sys.platform:
+            if not is_linux:
                 c1 = colorama.Fore.BLUE + colorama.Back.LIGHTCYAN_EX
                 c2 = colorama.Fore.BLUE + colorama.Back.LIGHTGREEN_EX
                 cr = colorama.Style.RESET_ALL
@@ -5658,7 +5659,7 @@ class BaseCase(unittest.TestCase):
         c1 = ""
         c2 = ""
         cr = ""
-        if "linux" not in sys.platform:
+        if not is_linux:
             c1 = colorama.Fore.RED + colorama.Back.LIGHTYELLOW_EX
             c2 = colorama.Fore.LIGHTRED_EX + colorama.Back.LIGHTYELLOW_EX
             cr = colorama.Style.RESET_ALL
@@ -5760,7 +5761,7 @@ class BaseCase(unittest.TestCase):
         c1 = ""
         c2 = ""
         cr = ""
-        if "linux" not in sys.platform:
+        if not is_linux:
             c1 = colorama.Fore.RED + colorama.Back.LIGHTYELLOW_EX
             c2 = colorama.Fore.LIGHTRED_EX + colorama.Back.LIGHTYELLOW_EX
             cr = colorama.Style.RESET_ALL
@@ -14009,6 +14010,9 @@ class BaseCase(unittest.TestCase):
             if not self.undetectable:
                 sb_config._virtual_display = self._xvfb_display
                 sb_config.headless_active = True
+            if self._reuse_session and hasattr(sb_config, "_vd_list"):
+                if isinstance(sb_config._vd_list, list):
+                    sb_config._vd_list.append(self._xvfb_display)
 
     def __activate_virtual_display(self):
         if self.undetectable and not (self.headless or self.headless2):
@@ -14033,6 +14037,9 @@ class BaseCase(unittest.TestCase):
                     self.__activate_standard_virtual_display()
                 else:
                     self.headless_active = True
+                    if self._reuse_session and hasattr(sb_config, "_vd_list"):
+                        if isinstance(sb_config._vd_list, list):
+                            sb_config._vd_list.append(self._xvfb_display)
             except Exception as e:
                 if hasattr(e, "msg"):
                     print("\n" + str(e.msg))
@@ -14087,7 +14094,7 @@ class BaseCase(unittest.TestCase):
         """This is only needed 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):
+        if is_linux and (not self.headed or self.xvfb):
             pip_find_lock = fasteners.InterProcessLock(
                 constants.PipInstall.FINDLOCK
             )
@@ -16604,7 +16611,11 @@ class BaseCase(unittest.TestCase):
             # (Pynose / Behave / Pure Python) Close all open browser windows
             self.__quit_all_drivers()
         # Resume tearDown() for all test runners, (Pytest / Pynose / Behave)
-        if hasattr(self, "_xvfb_display") and self._xvfb_display:
+        if (
+            hasattr(self, "_xvfb_display")
+            and self._xvfb_display
+            and not self._reuse_session
+        ):
             # Stop the Xvfb virtual display launched from BaseCase
             try:
                 if hasattr(self._xvfb_display, "stop"):
@@ -16619,6 +16630,13 @@ class BaseCase(unittest.TestCase):
             hasattr(sb_config, "_virtual_display")
             and sb_config._virtual_display
             and hasattr(sb_config._virtual_display, "stop")
+            and (
+                not hasattr(sb_config, "reuse_session")
+                or (
+                    hasattr(sb_config, "reuse_session")
+                    and not sb_config.reuse_session
+                )
+            )
         ):
             # CDP Mode may launch a 2nd Xvfb virtual display
             try:

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0}/seleniumbase/plugins/pytest_plugin.py

@@ -1371,6 +1371,7 @@ def pytest_addoption(parser):
 
     arg_join = " ".join(sys_argv)
     sb_config._browser_shortcut = None
+    sb_config._vd_list = []
 
     # SeleniumBase does not support pytest-timeout due to hanging browsers.
     for arg in sys_argv:
@@ -2017,6 +2018,13 @@ def pytest_runtest_teardown(item):
                 hasattr(self, "_xvfb_display")
                 and self._xvfb_display
                 and hasattr(self._xvfb_display, "stop")
+                and (
+                    not hasattr(sb_config, "reuse_session")
+                    or (
+                        hasattr(sb_config, "reuse_session")
+                        and not sb_config.reuse_session
+                    )
+                )
             ):
                 self.headless_active = False
                 sb_config.headless_active = False
@@ -2026,6 +2034,13 @@ def pytest_runtest_teardown(item):
                 hasattr(sb_config, "_virtual_display")
                 and sb_config._virtual_display
                 and hasattr(sb_config._virtual_display, "stop")
+                and (
+                    not hasattr(sb_config, "reuse_session")
+                    or (
+                        hasattr(sb_config, "reuse_session")
+                        and not sb_config.reuse_session
+                    )
+                )
             ):
                 sb_config._virtual_display.stop()
                 sb_config._virtual_display = None
@@ -2139,6 +2154,21 @@ def _perform_pytest_unconfigure_(config):
             except Exception:
                 pass
         sb_config.shared_driver = None
+        with suppress(Exception):
+            if (
+                hasattr(sb_config, "_virtual_display")
+                and sb_config._virtual_display
+                and hasattr(sb_config._virtual_display, "stop")
+            ):
+                sb_config._virtual_display.stop()
+                sb_config._virtual_display = None
+                sb_config.headless_active = False
+            if hasattr(sb_config, "_vd_list") and sb_config._vd_list:
+                if isinstance(sb_config._vd_list, list):
+                    for display in sb_config._vd_list:
+                        if display:
+                            with suppress(Exception):
+                                display.stop()
     if hasattr(sb_config, "log_path") and sb_config.item_count > 0:
         log_helper.archive_logs_if_set(
             constants.Logs.LATEST + "/", sb_config.archive_logs
@@ -2193,6 +2223,9 @@ def _perform_pytest_unconfigure_(config):
             the_html_r = the_html_r.replace(
                 ph_link, "%s and %s" % (sb_link, ph_link)
             )
+            the_html_r = the_html_r.replace(
+                "findAll('.collapsible", "//findAll('.collapsible"
+            )
             the_html_r = the_html_r.replace(
                 "mediaName.innerText", "//mediaName.innerText"
             )
@@ -2228,6 +2261,9 @@ def _perform_pytest_unconfigure_(config):
                     html_style = html_style.replace(
                         "- 80px);", "- 80px);\n  margin-bottom: -42px;"
                     )
+                    html_style = html_style.replace(".collapsible", ".oldc")
+                    html_style = html_style.replace(" (hide details)", "")
+                    html_style = html_style.replace(" (show details)", "")
                 with open(assets_style, "w", encoding="utf-8") as f:
                     f.write(html_style)
                 with suppress(Exception):
@@ -2327,6 +2363,9 @@ def _perform_pytest_unconfigure_(config):
                     html_style = html_style.replace(
                         "- 80px);", "- 80px);\n  margin-bottom: -42px;"
                     )
+                    html_style = html_style.replace(".collapsible", ".oldc")
+                    html_style = html_style.replace(" (hide details)", "")
+                    html_style = html_style.replace(" (show details)", "")
                 with open(assets_style, "w", encoding="utf-8") as f:
                     f.write(html_style)
                 with suppress(Exception):
@@ -2394,6 +2433,9 @@ def _perform_pytest_unconfigure_(config):
                 the_html_r = the_html_r.replace(
                     ph_link, "%s and %s" % (sb_link, ph_link)
                 )
+                the_html_r = the_html_r.replace(
+                    "findAll('.collapsible", "//findAll('.collapsible"
+                )
                 the_html_r = the_html_r.replace(
                     "mediaName.innerText", "//mediaName.innerText"
                 )

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0/seleniumbase.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: seleniumbase
-Version: 4.33.15
+Version: 4.33.16a0
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -68,8 +68,9 @@ Requires-Dist: attrs>=24.3.0
 Requires-Dist: certifi>=2024.12.14
 Requires-Dist: exceptiongroup>=1.2.2
 Requires-Dist: websockets~=13.1; python_version < "3.9"
-Requires-Dist: websockets>=14.1; python_version >= "3.9"
-Requires-Dist: filelock>=3.16.1
+Requires-Dist: websockets>=14.2; python_version >= "3.9"
+Requires-Dist: filelock~=3.16.1; python_version < "3.9"
+Requires-Dist: filelock>=3.17.0; python_version >= "3.9"
 Requires-Dist: fasteners>=0.19
 Requires-Dist: mycdp>=1.1.0
 Requires-Dist: pynose>=1.5.3
@@ -102,7 +103,8 @@ Requires-Dist: trio==0.28.0; python_version >= "3.9"
 Requires-Dist: trio-websocket==0.11.1
 Requires-Dist: wsproto==1.2.0
 Requires-Dist: websocket-client==1.8.0
-Requires-Dist: selenium==4.27.1
+Requires-Dist: selenium==4.27.1; python_version < "3.9"
+Requires-Dist: selenium==4.28.0; python_version >= "3.9"
 Requires-Dist: cssselect==1.2.0
 Requires-Dist: sortedcontainers==2.4.0
 Requires-Dist: execnet==2.1.1

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0}/seleniumbase.egg-info/requires.txt

@@ -4,7 +4,6 @@ wheel>=0.45.1
 attrs>=24.3.0
 certifi>=2024.12.14
 exceptiongroup>=1.2.2
-filelock>=3.16.1
 fasteners>=0.19
 mycdp>=1.1.0
 pynose>=1.5.3
@@ -30,7 +29,6 @@ outcome==1.3.0.post0
 trio-websocket==0.11.1
 wsproto==1.2.0
 websocket-client==1.8.0
-selenium==4.27.1
 cssselect==1.2.0
 sortedcontainers==2.4.0
 execnet==2.1.1
@@ -62,8 +60,10 @@ urllib3<2,>=1.26.20
 
 [:python_version < "3.9"]
 websockets~=13.1
+filelock~=3.16.1
 MarkupSafe==2.1.5
 trio==0.27.0
+selenium==4.27.1
 pytest-rerunfailures==14.0
 
 [:python_version >= "3.10"]
@@ -71,9 +71,11 @@ setuptools>=75.8.0
 urllib3<2.4.0,>=1.26.20
 
 [:python_version >= "3.9"]
-websockets>=14.1
+websockets>=14.2
+filelock>=3.17.0
 MarkupSafe>=3.0.2
 trio==0.28.0
+selenium==4.28.0
 pytest-rerunfailures==15.0
 
 [allure]

{seleniumbase-4.33.15 → seleniumbase-4.33.16a0}/setup.py

@@ -156,8 +156,9 @@ setup(
         "certifi>=2024.12.14",
         "exceptiongroup>=1.2.2",
         'websockets~=13.1;python_version<"3.9"',
-        'websockets>=14.1;python_version>="3.9"',
-        'filelock>=3.16.1',
+        'websockets>=14.2;python_version>="3.9"',
+        'filelock~=3.16.1;python_version<"3.9"',
+        'filelock>=3.17.0;python_version>="3.9"',
         'fasteners>=0.19',
         "mycdp>=1.1.0",
         "pynose>=1.5.3",
@@ -190,7 +191,8 @@ setup(
         'trio-websocket==0.11.1',
         'wsproto==1.2.0',
         'websocket-client==1.8.0',
-        'selenium==4.27.1',
+        'selenium==4.27.1;python_version<"3.9"',
+        'selenium==4.28.0;python_version>="3.9"',
         'cssselect==1.2.0',
         "sortedcontainers==2.4.0",
         'execnet==2.1.1',

seleniumbase-4.33.15/seleniumbase/__version__.py

@@ -1,2 +0,0 @@
-# seleniumbase package
-__version__ = "4.33.15"