Refactor the integrations for CFT and CHS

mdmintz · mdmintz · commit 988e613de371 · 2025-07-03T23:02:30.000-04:00
diff --git a/seleniumbase/behave/behave_sb.py b/seleniumbase/behave/behave_sb.py
@@ -11,6 +11,8 @@
 -D edge  (Shortcut for "-D browser=edge".)
 -D firefox  (Shortcut for "-D browser=firefox".)
 -D safari  (Shortcut for "-D browser=safari".)
+-D cft  (Shortcut for using `Chrome for Testing`)
+-D chs  (Shortcut for using `Chrome-Headless-Shell`)
 -D settings-file=FILE  (Override default SeleniumBase settings.)
 -D env=ENV  (Set the test env. Access with "self.env" in tests.)
 -D account=STR  (Set account. Access with "self.account" in tests.)
@@ -176,6 +178,7 @@ def get_configured_sb(context):
     sb.extension_zip = None
     sb.extension_dir = None
     sb.binary_location = None
+    sb_config.binary_location = None
     sb.driver_version = None
     sb.page_load_strategy = None
     sb.database_env = "test"
@@ -488,6 +491,19 @@ def get_configured_sb(context):
             if binary_location == "true":
                 binary_location = sb.binary_location  # revert to default
             sb.binary_location = binary_location
+            sb_config.binary_location = binary_location
+            continue
+        # Handle: -D cft
+        if low_key in ["cft"] and not sb_config.binary_location:
+            binary_location = "cft"
+            sb.binary_location = binary_location
+            sb_config.binary_location = binary_location
+            continue
+        # Handle: -D chs
+        if low_key in ["chs"] and not sb_config.binary_location:
+            binary_location = "chs"
+            sb.binary_location = binary_location
+            sb_config.binary_location = binary_location
             continue
         # Handle: -D driver-version=VER / driver_version=VER
         if low_key in ["driver-version", "driver_version"]:
diff --git a/seleniumbase/core/browser_launcher.py b/seleniumbase/core/browser_launcher.py
@@ -2880,9 +2880,15 @@ def get_driver(
     browser=None,  # A duplicate of browser_name to avoid confusion
 ):
     driver_dir = DRIVER_DIR
-    if sb_config.binary_location == "cft":
+    if (
+        hasattr(sb_config, "binary_location")
+        and sb_config.binary_location == "cft"
+    ):
         driver_dir = DRIVER_DIR_CFT
-    if sb_config.binary_location == "chs":
+    if (
+        hasattr(sb_config, "binary_location")
+        and sb_config.binary_location == "chs"
+    ):
         driver_dir = DRIVER_DIR_CHS
     if (
         hasattr(sb_config, "settings")
@@ -3827,10 +3833,16 @@ def get_local_driver(
     downloads_path = DOWNLOADS_FOLDER
     driver_dir = DRIVER_DIR
     special_chrome = False
-    if sb_config.binary_location == "cft":
+    if (
+        hasattr(sb_config, "binary_location")
+        and sb_config.binary_location == "cft"
+    ):
         special_chrome = True
         driver_dir = DRIVER_DIR_CFT
-    if sb_config.binary_location == "chs":
+    if (
+        hasattr(sb_config, "binary_location")
+        and sb_config.binary_location == "chs"
+    ):
         special_chrome = True
         driver_dir = DRIVER_DIR_CHS
     if (
diff --git a/seleniumbase/core/log_helper.py b/seleniumbase/core/log_helper.py
@@ -228,7 +228,11 @@ def log_test_failure_data(test, test_logpath, driver, browser, url=None):
         traceback_message = None
         if hasattr(test, "is_behave") and test.is_behave:
             if sb_config.behave_scenario.status.name == "failed":
-                if sb_config.behave_step.error_message:
+                if (
+                    hasattr(sb_config, "behave_step")
+                    and hasattr(sb_config.behave_step, "error_message")
+                    and sb_config.behave_step.error_message
+                ):
                     traceback_message = sb_config.behave_step.error_message
         else:
             format_exception = traceback.format_exception(
diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py
@@ -16905,7 +16905,11 @@ def tearDown(self):
                     self._last_page_url = "(Error: Unknown URL)"
             if hasattr(self, "is_behave") and self.is_behave and has_exception:
                 if hasattr(sb_config, "pdb_option") and sb_config.pdb_option:
-                    self.__activate_behave_post_mortem_debug_mode()
+                    if (
+                        hasattr(sb_config, "behave_step")
+                        and hasattr(sb_config.behave_step, "exc_traceback")
+                    ):
+                        self.__activate_behave_post_mortem_debug_mode()
             if self._final_debug:
                 self.__activate_debug_mode_in_teardown()
             elif (
diff --git a/seleniumbase/plugins/pytest_plugin.py b/seleniumbase/plugins/pytest_plugin.py
@@ -28,6 +28,8 @@ def pytest_addoption(parser):
     --edge  (Shortcut for "--browser=edge".)
     --firefox  (Shortcut for "--browser=firefox".)
     --safari  (Shortcut for "--browser=safari".)
+    --cft  (Shortcut for using `Chrome for Testing`)
+    --chs  (Shortcut for using `Chrome-Headless-Shell`)
     --settings-file=FILE  (Override default SeleniumBase settings.)
     --env=ENV  (Set the test env. Access with "self.env" in tests.)
     --account=STR  (Set account. Access with "self.account" in tests.)
diff --git a/seleniumbase/plugins/selenium_plugin.py b/seleniumbase/plugins/selenium_plugin.py
@@ -16,6 +16,8 @@ class SeleniumBrowser(Plugin):
     --edge  (Shortcut for "--browser=edge".)
     --firefox  (Shortcut for "--browser=firefox".)
     --safari  (Shortcut for "--browser=safari".)
+    --cft  (Shortcut for using `Chrome for Testing`)
+    --chs  (Shortcut for using `Chrome-Headless-Shell`)
     --user-data-dir=DIR  (Set the Chrome user data directory to use.)
     --protocol=PROTOCOL  (The Selenium Grid protocol: http|https.)
     --server=SERVER  (The Selenium Grid server/IP used for tests.)
@@ -1221,6 +1223,7 @@ def beforeTest(self, test):
             test.test.binary_location = "cft"
         elif self.options.use_chs and not test.test.binary_location:
             test.test.binary_location = "chs"
+        sb_config.binary_location = test.test.binary_location
         if (
             test.test.binary_location
             and test.test.binary_location.lower() == "chs"
