diff options
author | Joseph Frazier <1212jtraceur@gmail.com> | 2016-02-09 06:08:23 +0300 |
---|---|---|
committer | Joseph Frazier <1212jtraceur@gmail.com> | 2016-02-09 07:56:38 +0300 |
commit | d5aa948538671cb0c445ed8c5de71469e99c11c7 (patch) | |
tree | cdc4aab2cb873b20cf16aa10a856bb6c730d7e69 /bin | |
parent | fc5aaa64b354f2a4640288e6c9908cc33d77a791 (diff) |
npm test uses Electron if saucelabs cannot be used
Diffstat (limited to 'bin')
-rw-r--r-- | bin/test.js | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/bin/test.js b/bin/test.js index 2755c10..2c874f0 100644 --- 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) +} |