Adding support for reporting global javascript errors

swistak · Apr 6, 2013 · e431dcc · e431dcc
1 parent a641404
commit e431dcc
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/lib/guard/jasmine/phantomjs/guard-jasmine.coffee b/lib/guard/jasmine/phantomjs/guard-jasmine.coffee
@@ -24,7 +24,7 @@ errors = {}
 # Catch JavaScript errors
 #
 page.onError = (msg, trace) ->
-  if currentSpecId && currentSpecId isnt -1
+  if currentSpecId
     errors[currentSpecId] ||= []
     errors[currentSpecId].push({ msg: msg, trace: trace })
 
@@ -42,7 +42,7 @@ page.onConsoleMessage = (msg, line, source) ->
     logs[currentSpecId] = []
 
   else
-    logs[currentSpecId].push(msg) if currentSpecId isnt -1
+    logs[currentSpecId].push(msg)
 
 # Initialize the page before the JavaScript is run.
 #

diff --git a/lib/guard/jasmine/phantomjs/guard-jasmine.js b/lib/guard/jasmine/phantomjs/guard-jasmine.js
diff --git a/lib/guard/jasmine/phantomjs/lib/result.js b/lib/guard/jasmine/phantomjs/lib/result.js
diff --git a/lib/guard/jasmine/phantomjs/src/result.coffee b/lib/guard/jasmine/phantomjs/src/result.coffee
@@ -45,6 +45,19 @@ class Result
 
     suite
 
+  addGlobalError: (suite) ->
+    noSuites = !suite.suites || suite.suites.length == 0
+    noSpecs = !suite.specs || suite.specs.length == 0
+    globalErrors = @errors[-1] && @errors[-1].length != 0
+
+    if noSuites && noSpecs && globalErrors
+      err = @errors[-1][0]
+      errMsg = [ err.msg ]
+      for b in err.trace
+        errMsg.push "\n  #{b.file}:#{b.line} #{b.function}"
+      suite.error = errMsg.join("")
+      suite.passed = false
+
   # Clean unnecessary properties from the result
   #
   # @param [Object] suite the suite result
@@ -69,7 +82,9 @@ class Result
   #
   process: ->
     @addLogs(@result) if @options.console isnt 'never'
-    @addErrors(@result) if @options.errors isnt 'never'
+    if @options.errors isnt 'never'
+      @addErrors(@result)
+      @addGlobalError(@result)
     @cleanResult(@result)
 
     @result