Output trace on webpage error in phantomjs capture script and output diffviewer.html even if phantomjs script fails.

1 files changed, 9 insertions, 2 deletions

diff --git a/tests/resources/screenshot-capture/capture.js b/tests/resources/screenshot-capture/capture.js
index 84de3a3bbd..2231628332 100644
--- a/tests/resources/screenshot-capture/capture.js
+++ b/tests/resources/screenshot-capture/capture.js
@@ -93,8 +93,15 @@ PageRenderer.prototype = {
 
     _setupWebpageEvents: function () {
         var self = this;
-        this.webpage.onError = function (message) {
-            console.log("Webpage error: " + message);
+        this.webpage.onError = function (message, trace) {
+            var msgStack = ['Webpage error: ' + msg];
+            if (trace && trace.length) {
+                msgStack.push('trace:');
+                trace.forEach(function(t) {
+                    msgStack.push(' -> ' + t.file + ': ' + t.line + (t.function ? ' (in function "' + t.function + '")' : ''));
+                });
+            }
+            console.log(msgStack.join('\n'));
         };
 
         this.webpage.onConsoleMessage = function (message) {