npm test uses Electron if saucelabs cannot be used

unixcrh · Feb 9, 2016 · d5aa948 · d5aa948
1 parent fc5aaa6
commit d5aa948
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/bin/test.js b/bin/test.js
@@ -5,14 +5,17 @@ var spawn = require('cross-spawn-async')
 var runBrowserTests = process.env.TRAVIS && (!process.env.TRAVIS_PULL_REQUEST ||
   process.env.TRAVIS_PULL_REQUEST === 'false')
 
-var node = spawn('npm', ['run', 'test-node'], { stdio: 'inherit' })
-node.on('close', function (code) {
-  if (code === 0 && runBrowserTests) {
-    var browser = spawn('npm', ['run', 'test-browser'], { stdio: 'inherit' })
-    browser.on('close', function (code) {
+npmRun('test-node', function (code) {
+  if (code === 0) {
+    var scriptName = runBrowserTests ? 'test-browser' : 'test-browser-headless'
+    npmRun(scriptName, function (code) {
       process.exit(code)
     })
   } else {
     process.exit(code)
   }
 })
+
+function npmRun (scriptName, onClose) {
+  spawn('npm', ['run', scriptName], { stdio: 'inherit' }).on('close', onClose)
+}