software/jstestnode: Webdriver now uses geckodriver

software/jstestnode/instance.cfg.in

@@ -38,15 +38,6 @@ output = $${directory:bin}/runTestSuite
 buildout-directory = $${buildout:directory}
 mode = 0700
 
-[firefox-instance]
-recipe = slapos.cookbook:firefox
-executable = firefox
-runner-path = $${directory:bin}/$${:executable}
-firefox-path = ${firefox:location}/firefox-slapos
-prefsjs-path = $${directory:etc}/prefs.js
-shell-path = ${dash:location}/bin/dash
-tmp-path = $${xvfb-instance:tmp-path}
-
 [xvfb-instance]
 recipe = slapos.cookbook:xvfb
 runner-path = $${directory:services}/xvfb

software/jstestnode/runTestSuite.in

@@ -13,11 +13,9 @@ from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 
-# Put a 'firefox' executable in the path
-# otherwise, WebDriver refuses to start
-os.environ['PATH'] = '$${directory:bin}' + os.pathsep + os.environ['PATH']
+os.environ['TMPDIR'] = '$${xvfb-instance:tmp-path}'
+os.environ['DISPLAY'] = ':0'
 
-FIREFOX_EXECUTABLE = '$${firefox-instance:executable}'
 BASE_URL = 'http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/'
 
 def main():
@@ -91,8 +89,10 @@ def main():
     is_appium = False
     
     if args.target == 'firefox':
-      firefox_binary = webdriver.firefox.firefox_binary.FirefoxBinary(firefox_path=FIREFOX_EXECUTABLE)
-      browser = webdriver.Firefox(firefox_binary=firefox_binary,
+      firefox_capabilities = webdriver.common.desired_capabilities.DesiredCapabilities.FIREFOX
+      firefox_capabilities['marionette'] = True
+      firefox_capabilities['binary'] = '${firefox:location}/firefox-slapos'
+      browser = webdriver.Firefox(capabilities=firefox_capabilities,
                                   executable_path='${firefox:location}/geckodriver')
     elif args.target in ['iOS', 'Android']:
       # parameters for mobile emulators have different names then parameters for

software/jstestnode/software.cfg

@@ -25,7 +25,7 @@ parts =
 
 [instance]
 recipe = slapos.recipe.template
-md5sum = 929a2b6cf6bb16e22e49984563547ca9
+md5sum = 7c907db5f803b03a218b49888a3a3799
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
 mode = 0644
@@ -107,7 +107,7 @@ mode = 0644
 [template-runTestSuite]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/runTestSuite.in
-md5sum = 86f557c39d865a2b2a16e31fcf41d69c
+md5sum = fcf15b2a90340e0afe8f8b9921a4ffae
 output = ${buildout:directory}/runTestSuite.in
 mode = 0644