Refactor the code

Author: mdmintz

sbase/__init__.py

@@ -6,6 +6,7 @@
 from seleniumbase import encryption  # noqa
 from seleniumbase import get_driver  # noqa
 from seleniumbase import js_utils  # noqa
+from seleniumbase import shared_utils  # noqa
 from seleniumbase import MasterQA  # noqa
 from seleniumbase import page_actions  # noqa
 from seleniumbase import page_utils  # noqa

seleniumbase/__init__.py

@@ -14,6 +14,7 @@
 from seleniumbase.fixtures import js_utils  # noqa
 from seleniumbase.fixtures import page_actions  # noqa
 from seleniumbase.fixtures import page_utils  # noqa
+from seleniumbase.fixtures import shared_utils  # noqa
 from seleniumbase.fixtures.base_case import BaseCase  # noqa
 from seleniumbase.masterqa.master_qa import MasterQA  # noqa
 from seleniumbase.plugins.sb_manager import SB  # noqa

seleniumbase/behave/behave_sb.py

@@ -82,8 +82,8 @@
 -D incognito  (Enable Chrome's Incognito mode.)
 -D guest  (Enable Chrome's Guest mode.)
 -D devtools  (Open Chrome's DevTools when the browser opens.)
--D reuse-session | -D rs  (Reuse browser session for all tests.)
--D reuse-class-session | -D rcs  (Reuse session for tests in class/feature)
+-D rs | -D reuse-session  (Reuse browser session for all tests.)
+-D rcs | -D reuse-class-session  (Reuse session for tests in class/feature)
 -D crumbs  (Delete all cookies between tests reusing a session.)
 -D disable-beforeunload  (Disable the "beforeunload" event on Chrome.)
 -D window-size=WIDTH,HEIGHT  (Set the browser's starting window size.)
@@ -95,24 +95,21 @@
 -D external-pdf  (Set Chromium "plugins.always_open_pdf_externally":True.)
 -D timeout-multiplier=MULTIPLIER  (Multiplies the default timeout values.)
 """
-
 import ast
 import colorama
 import os
 import re
 import sys
+from seleniumbase import config as sb_config
 from seleniumbase.config import settings
-from seleniumbase.core import log_helper
 from seleniumbase.core import download_helper
+from seleniumbase.core import log_helper
 from seleniumbase.core import proxy_helper
 from seleniumbase.core import session_helper
 from seleniumbase.fixtures import constants
-from seleniumbase import config as sb_config
+from seleniumbase.fixtures import shared_utils
 
 sb_config.__base_class = None
-is_windows = False
-if sys.platform in ["win32", "win64", "x64"]:
-    is_windows = True
 
 
 def set_base_class(base_class):
@@ -817,10 +814,10 @@ def get_configured_sb(context):
             '\n  (Your browser choice was: "%s")\n' % sb.browser
         )
     # The Xvfb virtual display server is for Linux OS Only.
-    if sb.xvfb and "linux" not in sys.platform:
+    if sb.xvfb and not shared_utils.is_linux():
         sb.xvfb = False
     if (
-        "linux" in sys.platform
+        shared_utils.is_linux()
         and not sb.headed
         and not sb.headless
         and not sb.headless2
@@ -931,7 +928,6 @@ def get_configured_sb(context):
     log_helper.log_folder_setup(sb.log_path, sb.archive_logs)
     download_helper.reset_downloads_folder()
     proxy_helper.remove_proxy_zip_if_present()
-
     return sb
 
 
@@ -1007,7 +1003,7 @@ def dashboard_pre_processing():
     filename = None
     feature_name = None
     scenario_name = None
-    if is_windows:
+    if shared_utils.is_windows():
         output = output.decode("latin1")
     else:
         output = output.decode("utf-8")
@@ -1116,25 +1112,22 @@ def behave_dashboard_prepare():
         stars = "*" * star_len
         c1 = ""
         cr = ""
-        if "linux" not in sys.platform:
+        if not shared_utils.is_linux():
             colorama.init(autoreset=True)
             c1 = colorama.Fore.BLUE + colorama.Back.LIGHTCYAN_EX
             cr = colorama.Style.RESET_ALL
         print("Dashboard: %s%s%s\n%s" % (c1, dash_path, cr, stars))
 
 
 def _perform_behave_unconfigure_():
-    from seleniumbase.core import log_helper
-    from seleniumbase.core import proxy_helper
-
     if hasattr(sb_config, "multi_proxy") and not sb_config.multi_proxy:
         proxy_helper.remove_proxy_zip_if_present()
     if hasattr(sb_config, "reuse_session") and sb_config.reuse_session:
         # Close the shared browser session
         if sb_config.shared_driver:
             try:
                 if (
-                    not is_windows
+                    not shared_utils.is_windows()
                     or sb_config.browser == "ie"
                     or sb_config.shared_driver.service.process
                 ):
@@ -1210,7 +1203,7 @@ def do_final_driver_cleanup_as_needed():
     try:
         if hasattr(sb_config, "last_driver") and sb_config.last_driver:
             if (
-                not is_windows
+                not shared_utils.is_windows()
                 or sb_config.browser == "ie"
                 or sb_config.last_driver.service.process
             ):
@@ -1232,7 +1225,7 @@ def _perform_behave_terminal_summary_():
     equals = "=" * (equals_len + 2)
     c2 = ""
     cr = ""
-    if "linux" not in sys.platform:
+    if not shared_utils.is_linux():
         colorama.init(autoreset=True)
         c2 = colorama.Fore.MAGENTA + colorama.Back.LIGHTYELLOW_EX
         cr = colorama.Style.RESET_ALL

seleniumbase/console_scripts/run.py

@@ -40,7 +40,6 @@
 import sys
 import time
 from seleniumbase.fixtures import constants
-from seleniumbase.fixtures import shared_utils
 
 colorama.init(autoreset=True)
 
@@ -144,8 +143,8 @@ def show_install_usage():
     print("           sbase get chromedriver")
     print("           sbase get geckodriver")
     print("           sbase get edgedriver")
-    print("           sbase get chromedriver 112")
-    print("           sbase get chromedriver 112.0.5615.49")
+    print("           sbase get chromedriver 114")
+    print("           sbase get chromedriver 114.0.5735.90")
     print("           sbase get chromedriver latest")
     print("           sbase get chromedriver latest-1")
     print("           sbase get chromedriver -p")
@@ -976,12 +975,14 @@ def main():
             retry_msg_1 = "* Unable to download driver! Retrying in 3s..."
             retry_msg_2 = "** Unable to download driver! Retrying in 5s..."
             if " --proxy=" in " ".join(sys.argv):
+                from seleniumbase.core import proxy_helper
+
                 for arg in sys.argv:
                     if arg.startswith("--proxy="):
                         proxy_string = arg.split("--proxy=")[1]
                         if "@" in proxy_string:
                             proxy_string = proxy_string.split("@")[1]
-                        shared_utils.validate_proxy_string(proxy_string)
+                        proxy_helper.validate_proxy_string(proxy_string)
                         break
             try:
                 sb_install.main()

seleniumbase/console_scripts/sb_behave_gui.py

@@ -23,13 +23,10 @@
         "\n* SBase Commander requires Python 3.7 or newer!"
         "\n** You are currently using Python %s" % current_version
     )
+from seleniumbase.fixtures import shared_utils
 import tkinter as tk  # noqa: E402
 from tkinter.scrolledtext import ScrolledText  # noqa: E402
 
-is_windows = False
-if sys.platform in ["win32", "win64", "x64"]:
-    is_windows = True
-
 
 def set_colors(use_colors):
     c0 = ""
@@ -127,7 +124,7 @@ def do_behave_run(
 
     if headless:
         full_run_command += " -D headless"
-    elif "linux" in sys.platform:
+    elif shared_utils.is_linux():
         full_run_command += " -D gui"
 
     if save_screenshots:
@@ -188,7 +185,7 @@ def create_tkinter_gui(tests, command_string, t_count, f_count, s_tests):
         "Use Edge Browser  (-D edge)",
         "Use Firefox Browser  (-D firefox)",
     ]
-    if "darwin" in sys.platform:
+    if shared_utils.is_mac():
         options_list.append("Use Safari Browser  (-D safari)")
     brx = tk.StringVar(root)
     brx.set(options_list[0])
@@ -267,7 +264,7 @@ def create_tkinter_gui(tests, command_string, t_count, f_count, s_tests):
         row += " " * 200
         ara[count] = tk.IntVar()
         cb = None
-        if not is_windows:
+        if not shared_utils.is_windows():
             cb = tk.Checkbutton(
                 text_area,
                 text=(row),
@@ -362,7 +359,7 @@ def create_tkinter_gui(tests, command_string, t_count, f_count, s_tests):
 
 def main():
     use_colors = True
-    if "linux" in sys.platform:
+    if shared_utils.is_linux():
         use_colors = False
     c0, c1, c2, c3, c4, c5, c6, cr = set_colors(use_colors)
     command_args = sys.argv[2:]
@@ -414,7 +411,7 @@ def main():
     f_count = 0
     s_count = 0
     t_count = 0
-    if is_windows:
+    if shared_utils.is_windows():
         output = output.decode("latin1")
     else:
         output = output.decode("utf-8")

seleniumbase/console_scripts/sb_caseplans.py

@@ -27,14 +27,11 @@
         "\n* SBase Case Plans Generator requires Python 3.7 or newer!"
         "\n** You are currently using Python %s" % current_version
     )
+from seleniumbase.fixtures import shared_utils
 import tkinter as tk  # noqa: E402
 from tkinter import messagebox  # noqa: E402
 from tkinter.scrolledtext import ScrolledText  # noqa: E402
 
-is_windows = False
-if sys.platform in ["win32", "win64", "x64"]:
-    is_windows = True
-
 
 def set_colors(use_colors):
     c0 = ""
@@ -404,7 +401,7 @@ def create_tkinter_gui(tests, command_string):
         row += " " * 200
         ara[count] = tk.IntVar()
         cb = None
-        if not is_windows:
+        if not shared_utils.is_windows():
             cb = tk.Checkbutton(
                 text_area,
                 text=(row),

seleniumbase/console_scripts/sb_commander.py

@@ -28,13 +28,10 @@
         "\n* SBase Commander requires Python 3.7 or newer!"
         "\n** You are currently using Python %s" % current_version
     )
+from seleniumbase.fixtures import shared_utils
 import tkinter as tk  # noqa: E402
 from tkinter.scrolledtext import ScrolledText  # noqa: E402
 
-is_windows = False
-if sys.platform in ["win32", "win64", "x64"]:
-    is_windows = True
-
 
 def set_colors(use_colors):
     c0 = ""
@@ -154,7 +151,7 @@ def do_pytest_run(
 
     if headless:
         full_run_command += " --headless"
-    elif "linux" in sys.platform:
+    elif shared_utils.is_linux():
         full_run_command += " --gui"
 
     if save_screenshots:
@@ -191,7 +188,7 @@ def create_tkinter_gui(tests, command_string, files, solo_tests):
         "Use Edge Browser  (--edge)",
         "Use Firefox Browser  (--firefox)",
     ]
-    if "darwin" in sys.platform:
+    if shared_utils.is_mac():
         options_list.append("Use Safari Browser  (--safari)")
     brx = tk.StringVar(root)
     brx.set(options_list[0])
@@ -302,7 +299,7 @@ def create_tkinter_gui(tests, command_string, files, solo_tests):
         row += " " * 200
         ara[count] = tk.IntVar()
         cb = None
-        if not is_windows:
+        if not shared_utils.is_windows():
             cb = tk.Checkbutton(
                 text_area,
                 text=(row),
@@ -401,7 +398,7 @@ def create_tkinter_gui(tests, command_string, files, solo_tests):
 
 def main():
     use_colors = True
-    if "linux" in sys.platform:
+    if shared_utils.is_linux():
         use_colors = False
     c0, c1, c2, c3, c4, c5, cr = set_colors(use_colors)
     command_args = sys.argv[2:]