X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fphantom%2Fevaluate.js;h=0cf56f0d52a5fe74afb0c4914afb4d660bbefcaa;hb=5a126c522666307f9dffd7835c70fe1889d276cc;hp=27a2d717799d583c780731e3433cc2540db135df;hpb=b36bc57a37bde111fb57e3b1ef184b5ec28e1d93;p=mkws-moved-to-github.git

diff --git a/test/phantom/evaluate.js b/test/phantom/evaluate.js
index 27a2d71..0cf56f0 100644
--- a/test/phantom/evaluate.js
+++ b/test/phantom/evaluate.js
@@ -26,7 +26,7 @@ page.viewportSize = {
 
 // 0: silent, 1: some infos,  2: display console.log() output
 var debug = 2;
-if (system.env['DEBUG'] != 'undefined' && parseInt(system.env['DEBUG']) != NaN) {
+if (typeof system.env['DEBUG'] != 'undefined' && parseInt(system.env['DEBUG']) != NaN) {
     debug = system.env['DEBUG'];
     if (debug > 0) console.log("reset debug level to: " + debug);
 }
@@ -76,12 +76,18 @@ page.onAlert = function (msg) {
     console.log("Alert: " + msg);
 };
 
+// display HTTP errors
+page.onResourceError = function (resourceError) {
+    // console.log('phantomjs error code: ' + resourceError.errorCode);
+    console.log(resourceError.errorString);
+    phantom.exit(3);
+};
 
 page.open(url, function (status) {
     if (debug >= 1) console.log("fetch " + url + " with status: " + status);
 
     if (status != 'success') {
-        console.log("Failed to fetch page, give up");
+        console.log("Failed to fetch page, give up. Network error?");
         phantom.exit(1);
     }
 
@@ -93,11 +99,13 @@ page.open(url, function (status) {
             if (!window || !window.$ || !window.mkws) {
                 return false;
             } else {
+                var passing = window.$(".passingAlert").text() || window.$(".failingAlert").text();
+
                 return {
                     mkws: window.mkws,
                     html: window.$("html").html(),
                     duration: window.$(".duration").text(),
-                    passing: window.$(".passingAlert").text()
+                    passing: passing
                 };
             }
         })