Add cmd option "--disable-ws". (Chrome Web Security)

This commit is contained in:
Michael Mintz 2020-10-22 09:29:27 -04:00
parent 66c5933bfa
commit 375e3d4ebd
4 changed files with 28 additions and 3 deletions

View File

@ -47,6 +47,7 @@ except (ImportError, ValueError):
sb.log_path = "latest_logs/"
sb.archive_logs = False
sb.disable_csp = False
sb.disable_ws = False
sb.enable_ws = False
sb.enable_sync = False
sb.use_auto_ext = False

View File

@ -6229,7 +6229,10 @@ class BaseCase(unittest.TestCase):
self.block_images = sb_config.block_images
self.verify_delay = sb_config.verify_delay
self.disable_csp = sb_config.disable_csp
self.disable_ws = sb_config.disable_ws
self.enable_ws = sb_config.enable_ws
if not self.disable_ws:
self.enable_ws = True
self.enable_sync = sb_config.enable_sync
self.use_auto_ext = sb_config.use_auto_ext
self.no_sandbox = sb_config.no_sandbox

View File

@ -48,7 +48,8 @@ def pytest_addoption(parser):
--block-images (Block images from loading during tests.)
--verify-delay=SECONDS (The delay before MasterQA verification checks.)
--disable-csp (Disable the Content Security Policy of websites.)
--enable-ws (Enable Web Security on Chrome.)
--disable-ws (Disable Web Security on Chromium-based browsers.)
--enable-ws (Enable Web Security on Chromium-based browsers.)
--enable-sync (Enable "Chrome Sync".)
--use-auto-ext (Use Chrome's automation extension.)
--swiftshader (Use Chrome's "--use-gl=swiftshader" feature.)
@ -376,6 +377,12 @@ def pytest_addoption(parser):
libraries for various testing actions.
Setting this to True (--disable-csp) overrides the
value set in seleniumbase/config/settings.py""")
parser.addoption('--disable_ws', '--disable-ws', '--disable-web-security',
action="store_true",
dest='disable_ws',
default=False,
help="""Using this disables the "Web Security" feature of
Chrome and Chromium-based browsers such as Edge.""")
parser.addoption('--enable_ws', '--enable-ws', '--enable-web-security',
action="store_true",
dest='enable_ws',
@ -523,7 +530,10 @@ def pytest_configure(config):
sb_config.block_images = config.getoption('block_images')
sb_config.verify_delay = config.getoption('verify_delay')
sb_config.disable_csp = config.getoption('disable_csp')
sb_config.disable_ws = config.getoption('disable_ws')
sb_config.enable_ws = config.getoption('enable_ws')
if not sb_config.disable_ws:
sb_config.enable_ws = True
sb_config.enable_sync = config.getoption('enable_sync')
sb_config.use_auto_ext = config.getoption('use_auto_ext')
sb_config.no_sandbox = config.getoption('no_sandbox')

View File

@ -37,8 +37,9 @@ class SeleniumBrowser(Plugin):
--ad-block (Block some types of display ads after page loads.)
--block-images (Block images from loading during tests.)
--verify-delay=SECONDS (The delay before MasterQA verification checks.)
--disable-csp (This disables the Content Security Policy of websites.)
--enable-ws (Enable Web Security on Chrome.)
--disable-csp (Disable the Content Security Policy of websites.)
--disable-ws (Disable Web Security on Chromium-based browsers.)
--enable-ws (Enable Web Security on Chromium-based browsers.)
--enable-sync (Enable "Chrome Sync".)
--use-auto-ext (Use Chrome's automation extension.)
--swiftshader (Use Chrome's "--use-gl=swiftshader" feature.)
@ -280,6 +281,13 @@ class SeleniumBrowser(Plugin):
libraries for various testing actions.
Setting this to True (--disable-csp) overrides the
value set in seleniumbase/config/settings.py""")
parser.add_option(
'--disable_ws', '--disable-ws', '--disable-web-security',
action="store_true",
dest='disable_ws',
default=False,
help="""Using this disables the "Web Security" feature of
Chrome and Chromium-based browsers such as Edge.""")
parser.add_option(
'--enable_ws', '--enable-ws', '--enable-web-security',
action="store_true",
@ -407,7 +415,10 @@ class SeleniumBrowser(Plugin):
test.test.block_images = self.options.block_images
test.test.verify_delay = self.options.verify_delay # MasterQA
test.test.disable_csp = self.options.disable_csp
test.test.disable_ws = self.options.disable_ws
test.test.enable_ws = self.options.enable_ws
if not self.options.disable_ws:
test.test.enable_ws = True
test.test.enable_sync = self.options.enable_sync
test.test.use_auto_ext = self.options.use_auto_ext
test.test.no_sandbox = self.options.no_sandbox