Skip to content

Commit f15546b

Browse files
committed
Update command-line parameters for Chrome control
1 parent b28ac84 commit f15546b

File tree

4 files changed

+130
-15
lines changed

4 files changed

+130
-15
lines changed

seleniumbase/core/browser_launcher.py

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ def _add_chrome_disable_csp_extension(chrome_options):
9797

9898
def _set_chrome_options(
9999
downloads_path, headless, proxy_string, proxy_auth,
100-
proxy_user, proxy_pass, user_agent, disable_csp):
100+
proxy_user, proxy_pass, user_agent, disable_csp, enable_sync,
101+
user_data_dir, extension_zip, extension_dir):
101102
chrome_options = webdriver.ChromeOptions()
102103
prefs = {
103104
"download.default_directory": downloads_path,
@@ -108,6 +109,19 @@ def _set_chrome_options(
108109
}
109110
}
110111
chrome_options.add_experimental_option("prefs", prefs)
112+
if enable_sync:
113+
chrome_options.add_experimental_option(
114+
"excludeSwitches", ["disable-sync"])
115+
chrome_options.add_argument("--enable-sync")
116+
if user_data_dir:
117+
abs_path = os.path.abspath(user_data_dir)
118+
chrome_options.add_argument("user-data-dir=%s" % abs_path)
119+
if extension_zip:
120+
abs_path = os.path.abspath(extension_zip)
121+
chrome_options.add_extension(abs_path)
122+
if extension_dir:
123+
abs_path = os.path.abspath(extension_dir)
124+
chrome_options.add_argument("--load-extension=%s" % abs_path)
111125
chrome_options.add_argument("--test-type")
112126
chrome_options.add_argument("--log-level=3")
113127
chrome_options.add_argument("--no-first-run")
@@ -245,7 +259,9 @@ def validate_proxy_string(proxy_string):
245259

246260
def get_driver(browser_name, headless=False, use_grid=False,
247261
servername='localhost', port=4444, proxy_string=None,
248-
user_agent=None, cap_file=None, disable_csp=None):
262+
user_agent=None, cap_file=None, disable_csp=None,
263+
enable_sync=None, user_data_dir=None,
264+
extension_zip=None, extension_dir=None):
249265
proxy_auth = False
250266
proxy_user = None
251267
proxy_pass = None
@@ -271,19 +287,27 @@ def get_driver(browser_name, headless=False, use_grid=False,
271287
proxy_string = validate_proxy_string(proxy_string)
272288
if proxy_string and proxy_user and proxy_pass:
273289
proxy_auth = True
290+
if browser_name == "chrome" and user_data_dir and len(user_data_dir) < 3:
291+
raise Exception(
292+
"Name length of Chrome's User Data Directory must be >= 3.")
274293
if use_grid:
275294
return get_remote_driver(
276-
browser_name, headless, servername, port, proxy_string, proxy_auth,
277-
proxy_user, proxy_pass, user_agent, cap_file, disable_csp)
295+
browser_name, headless, servername, port,
296+
proxy_string, proxy_auth, proxy_user, proxy_pass, user_agent,
297+
cap_file, disable_csp, enable_sync, user_data_dir,
298+
extension_zip, extension_dir)
278299
else:
279300
return get_local_driver(
280-
browser_name, headless, proxy_string, proxy_auth,
281-
proxy_user, proxy_pass, user_agent, disable_csp)
301+
browser_name, headless,
302+
proxy_string, proxy_auth, proxy_user, proxy_pass, user_agent,
303+
disable_csp, enable_sync, user_data_dir,
304+
extension_zip, extension_dir)
282305

283306

284307
def get_remote_driver(
285308
browser_name, headless, servername, port, proxy_string, proxy_auth,
286-
proxy_user, proxy_pass, user_agent, cap_file, disable_csp):
309+
proxy_user, proxy_pass, user_agent, cap_file, disable_csp,
310+
enable_sync, user_data_dir, extension_zip, extension_dir):
287311
downloads_path = download_helper.get_downloads_folder()
288312
download_helper.reset_downloads_folder()
289313
address = "http://%s:%s/wd/hub" % (servername, port)
@@ -293,7 +317,8 @@ def get_remote_driver(
293317
if browser_name == constants.Browser.GOOGLE_CHROME:
294318
chrome_options = _set_chrome_options(
295319
downloads_path, headless, proxy_string, proxy_auth,
296-
proxy_user, proxy_pass, user_agent, disable_csp)
320+
proxy_user, proxy_pass, user_agent, disable_csp, enable_sync,
321+
user_data_dir, extension_zip, extension_dir)
297322
capabilities = chrome_options.to_capabilities()
298323
for key in desired_caps.keys():
299324
capabilities[key] = desired_caps[key]
@@ -400,8 +425,10 @@ def get_remote_driver(
400425

401426

402427
def get_local_driver(
403-
browser_name, headless, proxy_string, proxy_auth,
404-
proxy_user, proxy_pass, user_agent, disable_csp):
428+
browser_name, headless,
429+
proxy_string, proxy_auth, proxy_user, proxy_pass, user_agent,
430+
disable_csp, enable_sync, user_data_dir,
431+
extension_zip, extension_dir):
405432
'''
406433
Spins up a new web browser and returns the driver.
407434
Can also be used to spin up additional browsers for the same test.
@@ -493,8 +520,10 @@ def get_local_driver(
493520
elif browser_name == constants.Browser.GOOGLE_CHROME:
494521
try:
495522
chrome_options = _set_chrome_options(
496-
downloads_path, headless, proxy_string, proxy_auth,
497-
proxy_user, proxy_pass, user_agent, disable_csp)
523+
downloads_path, headless,
524+
proxy_string, proxy_auth, proxy_user, proxy_pass, user_agent,
525+
disable_csp, enable_sync, user_data_dir,
526+
extension_zip, extension_dir)
498527
if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER):
499528
make_driver_executable_if_not(LOCAL_CHROMEDRIVER)
500529
return webdriver.Chrome(

seleniumbase/fixtures/base_case.py

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2722,7 +2722,9 @@ def save_screenshot(self, name, folder=None):
27222722

27232723
def get_new_driver(self, browser=None, headless=None,
27242724
servername=None, port=None, proxy=None, agent=None,
2725-
switch_to=True, cap_file=None, disable_csp=None):
2725+
switch_to=True, cap_file=None, disable_csp=None,
2726+
enable_sync=None, user_data_dir=None,
2727+
extension_zip=None, extension_dir=None):
27262728
""" This method spins up an extra browser for tests that require
27272729
more than one. The first browser is already provided by tests
27282730
that import base_case.BaseCase from seleniumbase. If parameters
@@ -2734,6 +2736,12 @@ def get_new_driver(self, browser=None, headless=None,
27342736
port - if using a Selenium Grid, set the host port here
27352737
proxy - if using a proxy server, specify the "host:port" combo here
27362738
switch_to - the option to switch to the new driver (default = True)
2739+
cap_file - the file containing desired capabilities for the browser
2740+
disable_csp - an option to disable Chrome's Content Security Policy
2741+
enable_sync - the option to enable the "Chrome Sync" feature
2742+
user_data_dir - Chrome's User Data Directory to use (Chrome-only)
2743+
extension_zip - A Chrome Extension ZIP file to use (Chrome-only)
2744+
extension_dir - A Chrome Extension folder to use (Chrome-only)
27372745
"""
27382746
if self.browser == "remote" and self.servername == "localhost":
27392747
raise Exception('Cannot use "remote" browser driver on localhost!'
@@ -2777,6 +2785,14 @@ def get_new_driver(self, browser=None, headless=None,
27772785
user_agent = self.user_agent
27782786
if disable_csp is None:
27792787
disable_csp = self.disable_csp
2788+
if enable_sync is None:
2789+
enable_sync = self.enable_sync
2790+
if user_data_dir is None:
2791+
user_data_dir = self.user_data_dir
2792+
if extension_zip is None:
2793+
extension_zip = self.extension_zip
2794+
if extension_dir is None:
2795+
extension_dir = self.extension_dir
27802796
if self.demo_mode or self.masterqa_mode:
27812797
disable_csp = True
27822798
if cap_file is None:
@@ -2795,7 +2811,11 @@ def get_new_driver(self, browser=None, headless=None,
27952811
proxy_string=proxy_string,
27962812
user_agent=user_agent,
27972813
cap_file=cap_file,
2798-
disable_csp=disable_csp)
2814+
disable_csp=disable_csp,
2815+
enable_sync=enable_sync,
2816+
user_data_dir=user_data_dir,
2817+
extension_zip=extension_zip,
2818+
extension_dir=extension_dir)
27992819
self._drivers_list.append(new_driver)
28002820
if switch_to:
28012821
self.driver = new_driver
@@ -3213,6 +3233,10 @@ def setUp(self, masterqa_mode=False):
32133233
self.ad_block_on = sb_config.ad_block_on
32143234
self.verify_delay = sb_config.verify_delay
32153235
self.disable_csp = sb_config.disable_csp
3236+
self.enable_sync = sb_config.enable_sync
3237+
self.user_data_dir = sb_config.user_data_dir
3238+
self.extension_zip = sb_config.extension_zip
3239+
self.extension_dir = sb_config.extension_dir
32163240
self.save_screenshot_after_test = sb_config.save_screenshot
32173241
self.visual_baseline = sb_config.visual_baseline
32183242
self.timeout_multiplier = sb_config.timeout_multiplier
@@ -3286,7 +3310,11 @@ def setUp(self, masterqa_mode=False):
32863310
agent=self.user_agent,
32873311
switch_to=True,
32883312
cap_file=self.cap_file,
3289-
disable_csp=self.disable_csp)
3313+
disable_csp=self.disable_csp,
3314+
enable_sync=self.enable_sync,
3315+
user_data_dir=self.user_data_dir,
3316+
extension_zip=self.extension_zip,
3317+
extension_dir=self.extension_dir)
32903318
self._default_driver = self.driver
32913319

32923320
def __set_last_page_screenshot(self):

seleniumbase/plugins/pytest_plugin.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ def pytest_addoption(parser):
4545
default=None,
4646
help="""The file that stores browser desired capabilities
4747
for BrowserStack or Sauce Labs web drivers.""")
48+
parser.addoption('--user_data_dir', dest='user_data_dir',
49+
default=None,
50+
help="""The Chrome User Data Directory to use. (Profile)
51+
If the directory doesn't exist, it'll be created.""")
4852
parser.addoption('--with-testing_base', action="store_true",
4953
dest='with_testing_base',
5054
default=True,
@@ -117,6 +121,18 @@ def pytest_addoption(parser):
117121
help="""Designates the User-Agent for the browser to use.
118122
Format: A string.
119123
Default: None.""")
124+
parser.addoption('--extension_zip', action='store',
125+
dest='extension_zip',
126+
default=None,
127+
help="""Designates the Chrome Extension ZIP file to load.
128+
Format: A .zip file containing the Chrome extension.
129+
Default: None.""")
130+
parser.addoption('--extension_dir', action='store',
131+
dest='extension_dir',
132+
default=None,
133+
help="""Designates the Chrome Extension folder to load.
134+
Format: A directory containing the Chrome extension.
135+
Default: None.""")
120136
parser.addoption('--headless', action="store_true",
121137
dest='headless',
122138
default=False,
@@ -169,6 +185,10 @@ def pytest_addoption(parser):
169185
libraries for various testing actions.
170186
Setting this to True (--disable_csp) overrides the
171187
value set in seleniumbase/config/settings.py""")
188+
parser.addoption('--enable_sync', action="store_true",
189+
dest='enable_sync',
190+
default=False,
191+
help="""Using this enables the "Chrome Sync" feature.""")
172192
parser.addoption('--save_screenshot', action='store_true',
173193
dest='save_screenshot',
174194
default=False,
@@ -198,6 +218,8 @@ def pytest_configure(config):
198218
sb_config.with_selenium = config.getoption('with_selenium')
199219
sb_config.user_agent = config.getoption('user_agent')
200220
sb_config.headless = config.getoption('headless')
221+
sb_config.extension_zip = config.getoption('extension_zip')
222+
sb_config.extension_dir = config.getoption('extension_dir')
201223
sb_config.with_testing_base = config.getoption('with_testing_base')
202224
sb_config.with_db_reporting = config.getoption('with_db_reporting')
203225
sb_config.with_s3_logging = config.getoption('with_s3_logging')
@@ -208,6 +230,7 @@ def pytest_configure(config):
208230
sb_config.port = config.getoption('port')
209231
sb_config.proxy_string = config.getoption('proxy_string')
210232
sb_config.cap_file = config.getoption('cap_file')
233+
sb_config.user_data_dir = config.getoption('user_data_dir')
211234
sb_config.database_env = config.getoption('database_env')
212235
sb_config.log_path = config.getoption('log_path')
213236
sb_config.archive_logs = config.getoption('archive_logs')
@@ -219,6 +242,7 @@ def pytest_configure(config):
219242
sb_config.ad_block_on = config.getoption('ad_block_on')
220243
sb_config.verify_delay = config.getoption('verify_delay')
221244
sb_config.disable_csp = config.getoption('disable_csp')
245+
sb_config.enable_sync = config.getoption('enable_sync')
222246
sb_config.save_screenshot = config.getoption('save_screenshot')
223247
sb_config.visual_baseline = config.getoption('visual_baseline')
224248
sb_config.timeout_multiplier = config.getoption('timeout_multiplier')

seleniumbase/plugins/selenium_plugin.py

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ class SeleniumBrowser(Plugin):
1616
1717
The following command line options are available to the tests:
1818
self.options.browser -- the browser to use (--browser)
19+
self.options.cap_file -- browser's desired capabilities file (--cap_file)
20+
self.options.user_data_dir -- set Chrome's user data dir (--user_data_dir)
1921
self.options.server -- the server used by the test (--server)
2022
self.options.port -- the port used by the test (--port)
2123
self.options.proxy -- designates the proxy server:port to use. (--proxy)
2224
self.options.agent -- designates the User Agent for the browser. (--agent)
25+
self.options.extension_zip -- load a Chrome Extension ZIP (--extension_zip)
26+
self.options.extension_dir -- load a Chrome Extension DIR (--extension_dir)
2327
self.options.headless -- the option to run headlessly (--headless)
2428
self.options.demo_mode -- the option to slow down Selenium (--demo_mode)
2529
self.options.demo_sleep -- Selenium action delay in DemoMode (--demo_sleep)
@@ -29,6 +33,7 @@ class SeleniumBrowser(Plugin):
2933
self.options.ad_block -- the option to block some display ads (--ad_block)
3034
self.options.verify_delay -- delay before MasterQA checks (--verify_delay)
3135
self.options.disable_csp -- disable Content Security Policy (--disable_csp)
36+
self.options.enable_sync -- option to enable "Chrome Sync" (--enable_sync)
3237
self.options.save_screenshot -- save screen after test (--save_screenshot)
3338
self.options.visual_baseline -- set the visual baseline (--visual_baseline)
3439
self.options.timeout_multiplier -- increase defaults (--timeout_multiplier)
@@ -58,6 +63,12 @@ def options(self, parser, env):
5863
default=None,
5964
help="""The file that stores browser desired capabilities
6065
for BrowserStack or Sauce Labs web drivers.""")
66+
parser.add_option(
67+
'--user_data_dir', action='store',
68+
dest='user_data_dir',
69+
default=None,
70+
help="""The Chrome User Data Directory to use. (Chrome Profile)
71+
If the directory doesn't exist, it'll be created.""")
6172
parser.add_option(
6273
'--server', action='store', dest='servername',
6374
default='localhost',
@@ -84,6 +95,20 @@ def options(self, parser, env):
8495
help="""Designates the User-Agent for the browser to use.
8596
Format: A string.
8697
Default: None.""")
98+
parser.add_option(
99+
'--extension_zip', action='store',
100+
dest='extension_zip',
101+
default=None,
102+
help="""Designates the Chrome Extension ZIP file to load.
103+
Format: A .zip file containing the Chrome extension.
104+
Default: None.""")
105+
parser.add_option(
106+
'--extension_dir', action='store',
107+
dest='extension_dir',
108+
default=None,
109+
help="""Designates the Chrome Extension folder to load.
110+
Format: A directory containing the Chrome extension.
111+
Default: None.""")
87112
parser.add_option(
88113
'--headless', action="store_true",
89114
dest='headless',
@@ -139,6 +164,11 @@ def options(self, parser, env):
139164
libraries for various testing actions.
140165
Setting this to True (--disable_csp) overrides the
141166
value set in seleniumbase/config/settings.py""")
167+
parser.add_option(
168+
'--enable_sync', action="store_true",
169+
dest='enable_sync',
170+
default=False,
171+
help="""Using this enables the "Chrome Sync" feature.""")
142172
parser.add_option(
143173
'--save_screenshot', action="store_true",
144174
dest='save_screenshot',
@@ -174,6 +204,9 @@ def beforeTest(self, test):
174204
test.test.headless = self.options.headless
175205
test.test.servername = self.options.servername
176206
test.test.port = self.options.port
207+
test.test.user_data_dir = self.options.user_data_dir
208+
test.test.extension_zip = self.options.extension_zip
209+
test.test.extension_dir = self.options.extension_dir
177210
test.test.proxy_string = self.options.proxy_string
178211
test.test.user_agent = self.options.user_agent
179212
test.test.demo_mode = self.options.demo_mode
@@ -184,6 +217,7 @@ def beforeTest(self, test):
184217
test.test.ad_block_on = self.options.ad_block_on
185218
test.test.verify_delay = self.options.verify_delay # MasterQA
186219
test.test.disable_csp = self.options.disable_csp
220+
test.test.enable_sync = self.options.enable_sync
187221
test.test.save_screenshot_after_test = self.options.save_screenshot
188222
test.test.visual_baseline = self.options.visual_baseline
189223
test.test.timeout_multiplier = self.options.timeout_multiplier

0 commit comments

Comments
 (0)