Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11604 from edx/benp/lettuce-browser

Browse Source 
Dev user should be able to specify LETTUCE_BROWSER.
This commit is contained in:
Ben Patterson
2016-02-27 09:14:11 -05:00
parent 049fbb18fd 34e41449c7
commit 953014cfb2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/djangoapps/terrain/browser.py
View File

@@ -81,8 +81,6 @@ def initial_setup(server):
desired_capabilities['loggingPrefs'] = {
'browser': 'ALL',
}
elif browser_driver == 'firefox':
desired_capabilities = DesiredCapabilities.FIREFOX
else:
desired_capabilities = {}
@@ -98,7 +96,13 @@ def initial_setup(server):
# the browser session is invalid, this will
# raise a WebDriverException
try:
world.browser = Browser(browser_driver, desired_capabilities=desired_capabilities)
if browser_driver == 'firefox':
# Lettuce initializes differently for firefox, and sending
# desired_capabilities will not work. So initialize without
# sending desired_capabilities.
world.browser = Browser(browser_driver)
else:
world.browser = Browser(browser_driver, desired_capabilities=desired_capabilities)
world.browser.driver.set_script_timeout(GLOBAL_SCRIPT_TIMEOUT)
world.visit('/')