Refactoring and timing updates

Author: mdmintz

seleniumbase/behave/behave_sb.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 The SeleniumBase-Behave Connector configures command-line options.
 ******************************************************************

seleniumbase/fixtures/js_utils.py

@@ -171,13 +171,13 @@ def activate_jquery(driver):
         pass
     jquery_js = constants.JQuery.MIN_JS
     add_js_link(driver, jquery_js)
-    for x in range(27):
+    for x in range(32):
         # jQuery needs a small amount of time to activate.
         try:
             driver.execute_script("jQuery('html');")
             return
         except Exception:
-            if x == 15:
+            if x == 16:
                 add_js_link(driver, jquery_js)
             time.sleep(0.1)
     # Since jQuery still isn't activating, give up and raise an exception
@@ -768,7 +768,7 @@ def set_messenger_theme(
     time.sleep(0.1)
 
 
-def post_message(driver, message, msg_dur, style="info"):
+def post_message(driver, message, msg_dur=None, style="info"):
     """A helper method to post a message on the screen with Messenger.
     (Should only be called from post_message() in base_case.py)"""
     if not msg_dur:
@@ -797,7 +797,7 @@ def post_message(driver, message, msg_dur, style="info"):
             driver.execute_script(messenger_script)
 
 
-def post_messenger_success_message(driver, message, msg_dur):
+def post_messenger_success_message(driver, message, msg_dur=None):
     if not msg_dur:
         msg_dur = settings.DEFAULT_MESSAGE_DURATION
     msg_dur = float(msg_dur)
@@ -813,7 +813,7 @@ def post_messenger_success_message(driver, message, msg_dur):
         pass
 
 
-def post_messenger_error_message(driver, message, msg_dur):
+def post_messenger_error_message(driver, message, msg_dur=None):
     if not msg_dur:
         msg_dur = settings.DEFAULT_MESSAGE_DURATION
     msg_dur = float(msg_dur)

seleniumbase/plugins/pytest_plugin.py

@@ -935,8 +935,7 @@ def pytest_addoption(parser):
         default=None,
         help="""(DEPRECATED) - (UC Mode always uses this now.)
                 Use undetectable-chromedriver as a subprocess,
-                which can help avoid issues that might result.
-                It may reduce UC's ability to avoid detection.""",
+                which can help avoid issues that might result.""",
     )
     parser.addoption(
         "--no_sandbox",

seleniumbase/plugins/selenium_plugin.py

@@ -692,8 +692,7 @@ def options(self, parser, env):
             default=None,
             help="""(DEPRECATED) - (UC Mode always uses this now.)
                     Use undetectable-chromedriver as a subprocess,
-                    which can help avoid issues that might result.
-                    It may reduce UC's ability to avoid detection.""",
+                    which can help avoid issues that might result.""",
         )
         parser.add_option(
             "--no_sandbox",

seleniumbase/undetected/__init__.py

@@ -2,6 +2,7 @@
 import logging
 import os
 import re
+import subprocess
 import sys
 import time
 import selenium.webdriver.chrome.service
@@ -214,7 +215,7 @@ def __init__(
             options.binary_location = (
                 browser_executable_path or find_chrome_executable()
             )
-        self._delay = 3
+        self._delay = 2
         self.user_data_dir = user_data_dir
         self.keep_user_data_dir = keep_user_data_dir
         if suppress_welcome:
@@ -256,18 +257,15 @@ def __init__(
                 logger.debug("Fixed exit_type flag.")
         except Exception:
             logger.debug("Did not find a bad exit_type flag.")
+        creationflags = 0
+        if "win32" in sys_plat or "win64" in sys_plat or "x64" in sys_plat:
+            creationflags = subprocess.CREATE_NO_WINDOW
         self.options = options
         if not use_subprocess:
             self.browser_pid = start_detached(
                 options.binary_location, *options.arguments
             )
         else:
-            import subprocess
-
-            creationflags = 0
-            sys_plat = sys.platform
-            if "win32" in sys_plat or "win64" in sys_plat or "x64" in sys_plat:
-                creationflags = subprocess.CREATE_NO_WINDOW
             browser = subprocess.Popen(
                 [options.binary_location, *options.arguments],
                 stdin=subprocess.PIPE,
@@ -288,6 +286,10 @@ def __init__(
                 executable_path=driver_executable_path,
                 log_path=os.devnull,
             )
+        if hasattr(service_, "creationflags"):
+            setattr(service_, "creationflags", creationflags)
+        if hasattr(service_, "creation_flags"):
+            setattr(service_, "creation_flags", creationflags)
         super().__init__(
             port=port,
             options=options,