test

component/chromium/buildout.cfg

@@ -9,7 +9,7 @@ extends =
 
 parts = 
   chromium
-  
+
 [chromium]
 recipe = slapos.recipe.build
 slapos_promise =

component/firefox/buildout.cfg

@@ -26,12 +26,12 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 51.0
+version = 45.0.1
 
 # MD5SUMs are available at :
 # https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/MD5SUMS
-x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 0b37610d6a3e9cbbd37478e8356d93c3
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 371ddf3c87a001e5405b676f99c10793
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 3756c8d06d6f915a3dff1dae643ee74b
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 0409177ef649ec90ffe7a421a19bc156
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
@@ -46,4 +46,4 @@ script =
   export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()
-  os.chmod(wrapper_location, 0755)
+  os.chmod(wrapper_location, 0755)
\ No newline at end of file

software/jstestnode/instance.cfg.in

@@ -47,15 +47,6 @@ prefsjs-path = $${directory:etc}/prefs.js
 shell-path = ${dash:location}/bin/dash
 tmp-path = $${xvfb-instance:tmp-path}
 
-[chrome-instance]
-recipe = slapos.cookbook:chromium
-executable = firefox
-runner-path = $${directory:bin}/$${:executable}
-firefox-path = ${firefox:location}/chrome-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

@@ -18,7 +18,6 @@ from selenium.webdriver.support import expected_conditions as EC
 os.environ['PATH'] = '$${directory:bin}' + os.pathsep + os.environ['PATH']
 
 FIREFOX_EXECUTABLE = '$${firefox-instance:executable}'
-CHROME_EXECUTABLE = '$${chrome-instance:executable}'
 BASE_URL = 'http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/'
 
 def main():
@@ -94,9 +93,6 @@ def main():
     if args.target == 'firefox':
       firefox_binary = webdriver.firefox.firefox_binary.FirefoxBinary(firefox_path=FIREFOX_EXECUTABLE)
       browser = webdriver.Firefox(firefox_binary=firefox_binary)
-    elif args.target == 'chromium':
-      chrome_binary = webdriver.chrome.chrome_binary.FirefoxBinary(chrome_path=CHROME_EXECUTABLE)
-      browser = webdriver.Chrome()
     elif args.target in ['iOS', 'Android']:
       # parameters for mobile emulators have different names then parameters for
       # desktop OSes

software/jstestnode/software.cfg

@@ -8,6 +8,7 @@ extends =
   ../../component/dash/buildout.cfg
   ../../component/nginx/buildout.cfg
   ../../component/openssl/buildout.cfg
+  ../../component/chromium/buildout.cfg
 
 parts =
   slapos-cookbook
@@ -22,6 +23,7 @@ parts =
   nginx
   openssl
   instance
+  chromium
 
 [instance]
 recipe = slapos.recipe.template