test_framework
/
SeleniumBase
mirror of https://github.com/seleniumbase/SeleniumBase.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename maximize_window option to resolve method conflict

This commit is contained in:
Michael Mintz 2019-08-30 21:34:18 -04:00
parent 78bbf830d8
commit be736f575c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/raw_parameter_script.py
View File

@ -43,7 +43,7 @@ except (ImportError, ValueError):
b.disable_csp = False b.disable_csp = False
b.enable_sync = False b.enable_sync = False
b.visual_baseline = False b.visual_baseline = False
b.maximize_window = False b.maximize_option = False
b.save_screenshot_after_test = False b.save_screenshot_after_test = False
b.timeout_multiplier = None b.timeout_multiplier = None
b.pytest_html_report = None b.pytest_html_report = None

4
seleniumbase/fixtures/base_case.py
View File

@ -2820,7 +2820,7 @@ class BaseCase(unittest.TestCase):
else: else:
if self.browser == 'chrome' or self.browser == 'opera': if self.browser == 'chrome' or self.browser == 'opera':
try: try:
if self.maximize_window: if self.maximize_option:
self.driver.maximize_window() self.driver.maximize_window()
else: else:
self.driver.set_window_size(1250, 840) self.driver.set_window_size(1250, 840)
@ -3252,7 +3252,7 @@ class BaseCase(unittest.TestCase):
self.user_data_dir = sb_config.user_data_dir self.user_data_dir = sb_config.user_data_dir
self.extension_zip = sb_config.extension_zip self.extension_zip = sb_config.extension_zip
self.extension_dir = sb_config.extension_dir self.extension_dir = sb_config.extension_dir
self.maximize_window = sb_config.maximize_window self.maximize_option = sb_config.maximize_option
self.save_screenshot_after_test = sb_config.save_screenshot self.save_screenshot_after_test = sb_config.save_screenshot
self.visual_baseline = sb_config.visual_baseline self.visual_baseline = sb_config.visual_baseline
self.timeout_multiplier = sb_config.timeout_multiplier self.timeout_multiplier = sb_config.timeout_multiplier

4
seleniumbase/plugins/pytest_plugin.py
View File

@ -285,7 +285,7 @@ def pytest_addoption(parser):
parser.addoption('--maximize_window', '--maximize-window', '--maximize', parser.addoption('--maximize_window', '--maximize-window', '--maximize',
'--fullscreen', '--fullscreen',
action="store_true", action="store_true",
dest='maximize_window', dest='maximize_option',
default=False, default=False,
help="""The option to start with the browser window help="""The option to start with the browser window
maximized.""") maximized.""")
@ -349,7 +349,7 @@ def pytest_configure(config):
sb_config.verify_delay = config.getoption('verify_delay') sb_config.verify_delay = config.getoption('verify_delay')
sb_config.disable_csp = config.getoption('disable_csp') sb_config.disable_csp = config.getoption('disable_csp')
sb_config.enable_sync = config.getoption('enable_sync') sb_config.enable_sync = config.getoption('enable_sync')
sb_config.maximize_window = config.getoption('maximize_window') sb_config.maximize_option = config.getoption('maximize_option')
sb_config.save_screenshot = config.getoption('save_screenshot') sb_config.save_screenshot = config.getoption('save_screenshot')
sb_config.visual_baseline = config.getoption('visual_baseline') sb_config.visual_baseline = config.getoption('visual_baseline')
sb_config.timeout_multiplier = config.getoption('timeout_multiplier') sb_config.timeout_multiplier = config.getoption('timeout_multiplier')

4
seleniumbase/plugins/selenium_plugin.py
View File

@ -217,7 +217,7 @@ class SeleniumBrowser(Plugin):
'--maximize_window', '--maximize-window', '--maximize', '--maximize_window', '--maximize-window', '--maximize',
'--fullscreen', '--fullscreen',
action="store_true", action="store_true",
dest='maximize_window', dest='maximize_option',
default=False, default=False,
help="""The option to start with the web browser maximized.""") help="""The option to start with the web browser maximized.""")
parser.add_option( parser.add_option(
@ -274,7 +274,7 @@ class SeleniumBrowser(Plugin):
test.test.verify_delay = self.options.verify_delay # MasterQA test.test.verify_delay = self.options.verify_delay # MasterQA
test.test.disable_csp = self.options.disable_csp test.test.disable_csp = self.options.disable_csp
test.test.enable_sync = self.options.enable_sync test.test.enable_sync = self.options.enable_sync
test.test.maximize_window = self.options.maximize_window test.test.maximize_option = self.options.maximize_option
test.test.save_screenshot_after_test = self.options.save_screenshot test.test.save_screenshot_after_test = self.options.save_screenshot
test.test.visual_baseline = self.options.visual_baseline test.test.visual_baseline = self.options.visual_baseline
test.test.timeout_multiplier = self.options.timeout_multiplier test.test.timeout_multiplier = self.options.timeout_multiplier