Refactor options

Author: mdmintz

seleniumbase/behave/behave_sb.py

@@ -545,12 +545,12 @@ def get_configured_sb(context):
         if low_key in ["disable-js", "disable_js"]:
             sb.disable_js = True
             continue
-        # Handle: -D disable-csp / disable_csp
-        if low_key in ["disable-csp", "disable_csp"]:
+        # Handle: -D disable-csp / disable_csp / dcsp
+        if low_key in ["disable-csp", "disable_csp", "dcsp"]:
             sb.disable_csp = True
             continue
-        # Handle: -D disable-ws / disable_ws
-        if low_key in ["disable-ws", "disable_ws"]:
+        # Handle: -D disable-ws / disable_ws / dws
+        if low_key in ["disable-ws", "disable_ws", "dws"]:
             sb.disable_ws = True
             continue
         # Handle: -D enable-ws / enable_ws

seleniumbase/plugins/driver_manager.py

@@ -620,8 +620,24 @@ def Driver(
     elif browser not in ["chrome", "edge"]:
         headless2 = False  # Only for Chromium browsers
     if disable_csp is None:
-        disable_csp = False
+        if (
+            "--disable-csp" in sys_argv
+            or "--no-csp" in sys_argv
+            or "--dcsp" in sys_argv
+        ):
+            disable_csp = True
+        else:
+            disable_csp = False
     if (
+        (enable_ws is None and disable_ws is None)
+        and (
+            "--disable-web-security" in sys_argv
+            or "--disable-ws" in sys_argv
+            or "--dws" in sys_argv
+        )
+    ):
+        enable_ws = False
+    elif (
         (enable_ws is None and disable_ws is None)
         or (disable_ws is not None and not disable_ws)
         or (enable_ws is not None and enable_ws)

seleniumbase/plugins/pytest_plugin.py

@@ -1021,6 +1021,7 @@ def pytest_addoption(parser):
     parser.addoption(
         "--disable_ws",
         "--disable-ws",
+        "--dws",
         "--disable-web-security",
         action="store_true",
         dest="disable_ws",

seleniumbase/plugins/sb_manager.py

@@ -711,8 +711,25 @@ def SB(
     else:
         variables = {}
     if disable_csp is None:
-        disable_csp = False
+        if (
+            "--disable-csp" in sys_argv
+            or "--no-csp" in sys_argv
+            or "--dcsp" in sys_argv
+        ):
+            disable_csp = True
+        else:
+            disable_csp = False
     if (
+        (enable_ws is None and disable_ws is None)
+        and (
+            "--disable-web-security" in sys_argv
+            or "--disable-ws" in sys_argv
+            or "--dws" in sys_argv
+        )
+    ):
+        enable_ws = False
+        disable_ws = True
+    elif (
         (enable_ws is None and disable_ws is None)
         or (disable_ws is not None and not disable_ws)
         or (enable_ws is not None and enable_ws)

seleniumbase/plugins/selenium_plugin.py

@@ -739,6 +739,7 @@ def options(self, parser, env):
         parser.addoption(
             "--disable_ws",
             "--disable-ws",
+            "--dws",
             "--disable-web-security",
             action="store_true",
             dest="disable_ws",