Commit 95131078 by Ben Patterson

Dev user should be able to specify LETTUCE_BROWSER.

parent 46533015
...@@ -82,7 +82,7 @@ def initial_setup(server): ...@@ -82,7 +82,7 @@ def initial_setup(server):
'browser': 'ALL', 'browser': 'ALL',
} }
elif browser_driver == 'firefox': elif browser_driver == 'firefox':
desired_capabilities = DesiredCapabilities.FIREFOX desired_capabilities = {}
else: else:
desired_capabilities = {} desired_capabilities = {}
...@@ -98,7 +98,11 @@ def initial_setup(server): ...@@ -98,7 +98,11 @@ def initial_setup(server):
# the browser session is invalid, this will # the browser session is invalid, this will
# raise a WebDriverException # raise a WebDriverException
try: 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.browser.driver.set_script_timeout(GLOBAL_SCRIPT_TIMEOUT)
world.visit('/') world.visit('/')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment