From 95131078571b212c1728544fc6b404ab415700ed Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Fri, 19 Feb 2016 13:29:21 -0500 Subject: [PATCH 1/2] Dev user should be able to specify LETTUCE_BROWSER. --- common/djangoapps/terrain/browser.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py index ad3d3e6de9..02410fac76 100644 --- a/common/djangoapps/terrain/browser.py +++ b/common/djangoapps/terrain/browser.py @@ -82,7 +82,7 @@ def initial_setup(server): 'browser': 'ALL', } elif browser_driver == 'firefox': - desired_capabilities = DesiredCapabilities.FIREFOX + desired_capabilities = {} else: desired_capabilities = {} @@ -98,7 +98,11 @@ 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': + + 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('/') From 34e41449c72a61e57abad89f8e0a8e6d77fd7c04 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Fri, 26 Feb 2016 07:52:07 -0500 Subject: [PATCH 2/2] Clean up based on feedback. --- common/djangoapps/terrain/browser.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py index 02410fac76..ffad1f7fb8 100644 --- a/common/djangoapps/terrain/browser.py +++ b/common/djangoapps/terrain/browser.py @@ -81,8 +81,6 @@ def initial_setup(server): desired_capabilities['loggingPrefs'] = { 'browser': 'ALL', } - elif browser_driver == 'firefox': - desired_capabilities = {} else: desired_capabilities = {} @@ -99,7 +97,9 @@ def initial_setup(server): # raise a WebDriverException try: 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)