Merge pull request #592 from Medium/nicks/error

Better error handling on the run() method

lib/phantomjs.js

@@ -88,12 +88,35 @@ exports.run = function () {
     try {
       var program = exports.exec.apply(null, args)
       var isFirst = true
+      var stderr = ''
       program.stdout.on('data', function () {
         // This detects PhantomJS instance get ready.
         if (!isFirst) return
         isFirst = false
         resolve(program)
       })
+      program.stderr.on('data', function (data) {
+        stderr = stderr + data.toString('utf8')
+      })
+      program.on('error', function (err) {
+        if (!isFirst) return
+        isFirst = false
+        reject(err)
+      })
+      program.on('exit', function (code) {
+        if (!isFirst) return
+        isFirst = false
+        if (code == 0) {
+          // PhantomJS doesn't use exit codes correctly :(
+          if (stderr.indexOf('Error:') == 0) {
+            reject(new Error(stderr))
+          } else {
+            resolve(program)
+          }
+        } else {
+          reject(new Error('Exit code: ' + code))
+        }
+      })
     } catch (err) {
       reject(err)
     }

test/tests.js

@@ -123,3 +123,14 @@ exports.testPhantomRun = function (test) {
       })
   })
 }
+
+exports.testPhantomRunError = function (test) {
+  test.expect(1)
+  phantomjs.run('--bogus').then(function () {
+    test.ok(false, 'Expected not to start')
+    test.done()
+  }, function (err) {
+    test.equal('Error: Unknown option: bogus\n', err.message)
+    test.done()
+  })
+}