seleniumbase 4.33.14__py3-none-any.whl → 4.33.16a0__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.33.14"
+__version__ = "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/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/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):
@@ -1901,7 +1902,7 @@ class BaseCase(unittest.TestCase):
             timeout = self.__get_new_timeout(timeout)
         selector, by = self.__recalculate_selector(selector, by)
         if self.__is_cdp_swap_needed():
-            return self.cdp.get_element_attribute(selector)
+            return self.cdp.get_element_attribute(selector, attribute)
         self.wait_for_ready_state_complete()
         time.sleep(0.01)
         if self.__is_shadow_selector(selector):
@@ -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/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.14.dist-info → seleniumbase-4.33.16a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: seleniumbase
-Version: 4.33.14
+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.14.dist-info → seleniumbase-4.33.16a0.dist-info}/RECORD

@@ -3,7 +3,7 @@ sbase/__main__.py,sha256=G0bVB1-DM4PGwQ1KyOupaWCs4ePbChZNNWuX2htim5U,647
 sbase/steps.py,sha256=_WvAjydKqZfTdnZW9LPKkRty-g-lfdUPmLqnZj6ulcs,43013
 seleniumbase/__init__.py,sha256=OtJh8nGKL4xtZpw8KPqmn7Q6R-86t4cWUDyVF5MbMTo,2398
 seleniumbase/__main__.py,sha256=dn1p6dgCchmcH1zzTzzQvFwwdQQqnTGH6ULV9m4hv24,654
-seleniumbase/__version__.py,sha256=Q_D-zUajInHk9GZZf-tvj8uVrrttgPmchS1wqY3voWc,47
+seleniumbase/__version__.py,sha256=w5nhncFHUMDRcAGa9Oi3T4P6zamp95RMBhMKFQQBawI,49
 seleniumbase/behave/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/behave/behave_helper.py,sha256=elkl8P9eLulRAioLstE9baYNM9N_PHBmAOcajX-pH_Y,24198
 seleniumbase/behave/behave_sb.py,sha256=-hza7Nx2U41mSObYiPMi48v3JlPh3sJO3yzP0kqZ1Gk,59174
@@ -24,7 +24,7 @@ seleniumbase/console_scripts/rich_helper.py,sha256=U_zvXpalxVV8rtg8c8EnNNmnh45ti
 seleniumbase/console_scripts/run.py,sha256=t_mpBUIJLBrUtzJ5RQL5y8UVCTm7DhNyS94rHwIOnRs,58850
 seleniumbase/console_scripts/sb_behave_gui.py,sha256=3Zl7_QQczvkkQW_UuaqYEUlEjiZ6AJzHR9GeNyVVXkc,15147
 seleniumbase/console_scripts/sb_caseplans.py,sha256=qlmvjQ49bOBE1Q29fVmabimkVibCVr25GNtJhFPTMrc,18145
-seleniumbase/console_scripts/sb_commander.py,sha256=yqoAK211OE6x5AWL2IAo8WojHtdkVj0AWqfoJ-ewmyo,13329
+seleniumbase/console_scripts/sb_commander.py,sha256=1KJpJEWU4QpySdx4xzdZxsVZdQvalXh9Na7P4ZfMNJo,13354
 seleniumbase/console_scripts/sb_install.py,sha256=y84Zk-rcp554kcF_g97Xwl0Rn38pyH9wO5OKHX879RI,45831
 seleniumbase/console_scripts/sb_mkchart.py,sha256=ep9g-9CSIwaOJKVxhB3xjRQpfsuApyN8-Dr129cNXwQ,10941
 seleniumbase/console_scripts/sb_mkdir.py,sha256=SaI2wnjE5eQLxX8RPdjFjM_ghBbMm4r_vBUzU5t5dzY,29819
@@ -36,7 +36,7 @@ seleniumbase/console_scripts/sb_print.py,sha256=tNy-bMDgwHJO3bZxMpmo9weSE8uhbH0C
 seleniumbase/console_scripts/sb_recorder.py,sha256=fnHb5-kh11Hit-E9Ha-e4QXzqLcZvtij6mb5qNd4B1Q,11032
 seleniumbase/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/core/application_manager.py,sha256=e_0sjtI8cjY5BNyZj1QBR0j6_oCScxGmSXYEpcYwuZE,576
-seleniumbase/core/browser_launcher.py,sha256=EmSQ9x5tWu3TrzWvM-P9K4D0w4TrkHcaIbDalePdsxI,225141
+seleniumbase/core/browser_launcher.py,sha256=0sncs1HUsHy6mSLJWl9V_o5d3QC0BVh1pRc3yHMrY5k,226368
 seleniumbase/core/capabilities_parser.py,sha256=meIS2uHapTCq2ldfNAToC7r0cKmZDRXuYNKExM1GHDY,6038
 seleniumbase/core/colored_traceback.py,sha256=DrRWfg7XEnKcgY59Xj7Jdk09H-XqHYBSUpB-DiZt6iY,2020
 seleniumbase/core/create_db_tables.sql,sha256=VWPtrdiW_HQ6yETHjqTu-VIrTwvd8I8o1NfBeaVSHpU,972
@@ -65,7 +65,7 @@ seleniumbase/extensions/disable_csp.zip,sha256=YMifIIgEBiLrEFrS1sfW4Exh4br1V4oK1
 seleniumbase/extensions/recorder.zip,sha256=OOyzF-Ize2cSRu1CqhzSAq5vusI9hqLLd2OIApUHesI,11918
 seleniumbase/extensions/sbase_ext.zip,sha256=3s1N8zrVaMz8RQEOIoBzC3KDjtmHwVZRvVsX25Odr_s,8175
 seleniumbase/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-seleniumbase/fixtures/base_case.py,sha256=IfOwY0b31ngawTZY0thwHvcRGOSCUd647sm_iGKIMk0,719922
+seleniumbase/fixtures/base_case.py,sha256=cAPiEkviPoV0cn7FEa9RsNqkK6gNw2DHN0W4-vaQJg8,720631
 seleniumbase/fixtures/constants.py,sha256=e1LppavlrAcI4XBJMq7u5j8SffaQ7SPQps1y0YvZYfY,13649
 seleniumbase/fixtures/css_to_xpath.py,sha256=9ouDB1xl4MJ2os6JOgTIAyHKOQfuxtxvXC3O5hSnEKA,1954
 seleniumbase/fixtures/errors.py,sha256=KyxuEVx_e3MPhVrJfNIa_3ltMpbCFxfy_jxK8RFNTns,555
@@ -88,7 +88,7 @@ seleniumbase/plugins/basic_test_info.py,sha256=8ov6n417gPbqqvrlT4zrch7l2XcRt-GF2
 seleniumbase/plugins/db_reporting_plugin.py,sha256=En09qUCoojrk9-vbcnsoHdSELoGmag2GDIyu3jTiJas,7331
 seleniumbase/plugins/driver_manager.py,sha256=s20s0pJYaNrG0WNwyIC04oUMRVFjtm6V_nS1-EvFm7g,34492
 seleniumbase/plugins/page_source.py,sha256=loTnXxOj4kxEukuTZEiGyvKBhY3KDVDMnNlHHheTBDE,1889
-seleniumbase/plugins/pytest_plugin.py,sha256=JjpglUqHkfl6rzdg1SkJ7PMtNRpceOgLNbUi2DyKpJI,105416
+seleniumbase/plugins/pytest_plugin.py,sha256=uSfHTgeI30RpyGxXPzszvKpBJ5epGi1WDJobEtXEjBk,107389
 seleniumbase/plugins/s3_logging_plugin.py,sha256=WDfertQgGOW_SRJpFMaekYD6vBVW9VO62POtXXy2HCM,2319
 seleniumbase/plugins/sb_manager.py,sha256=Z19CfRSaqcxdn_YvzXVt4B9Nu3Bhs97QIO5tHlvbuyk,54871
 seleniumbase/plugins/screen_shots.py,sha256=1hrXw-hzuZ1BR6Yh7AyWX2ABnvnP73-RCbwdz958gj4,1127
@@ -135,9 +135,9 @@ seleniumbase/utilities/selenium_grid/start-grid-hub.bat,sha256=Ftq-GrAKRYH2ssDPr
 seleniumbase/utilities/selenium_grid/start-grid-hub.sh,sha256=KADv0RUHONLL2_I443QFK8PryBpDmKn5Gy0s4o0vDSM,106
 seleniumbase/utilities/selenium_ide/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/utilities/selenium_ide/convert_ide.py,sha256=pZFnqEJQEKZPyNFjkLD29s2HPQgCrWW9XJWpCPhWOoM,31691
-seleniumbase-4.33.14.dist-info/LICENSE,sha256=BRblZsX7HyPUjQmYTiyWr_e9tzWvmR3R4SFclM2R3W0,1085
-seleniumbase-4.33.14.dist-info/METADATA,sha256=wIaQapNMjEF9UK-lQCgYy12qmBRfagtFSUMyje7r_t8,86361
-seleniumbase-4.33.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-seleniumbase-4.33.14.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.33.14.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.33.14.dist-info/RECORD,,
+seleniumbase-4.33.16a0.dist-info/LICENSE,sha256=BRblZsX7HyPUjQmYTiyWr_e9tzWvmR3R4SFclM2R3W0,1085
+seleniumbase-4.33.16a0.dist-info/METADATA,sha256=m9-RrMR7dxHe-4VatvhE70QwDHlcsgWZBLx0tGWluBk,86525
+seleniumbase-4.33.16a0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+seleniumbase-4.33.16a0.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.33.16a0.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.33.16a0.dist-info/RECORD,,