X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Fphantom%2Fevaluate.js;fp=test%2Fphantom%2Fevaluate.js;h=52e044dfbed7c68aa4ce988575a64f76457d0691;hb=c40451977ccc4a9759f53aae07bdb1a576b8e2e4;hp=bb6a5375cff5b9eac277297de9834c45ac83fff7;hpb=2b7e272dc1072cf1cb80769f40a5cbbb16c30f03;p=mkws-moved-to-github.git

diff --git a/test/phantom/evaluate.js b/test/phantom/evaluate.js
index bb6a537..52e044d 100644
--- a/test/phantom/evaluate.js
+++ b/test/phantom/evaluate.js
@@ -14,15 +14,19 @@ if (system.args.length === 1) {
 }
 var url = system.args[1];
 
+var run_time = 8; // poll up to seconds
+if (system.args[2] && parseFloat(system.args[2]) > 0) {
+    run_time = parseFloat(system.args[2]);
+}
+
 page.viewportSize = {
     width: 1200,
     height: 1000
 };
 
-var run_time = 8; // poll up to seconds
-if (system.args[2] && parseFloat(system.args[2]) > 0) {
-    run_time = parseFloat(system.args[2]);
-}
+// 0: silent, 1: some infos,  2: display console.log() output
+var debug = 2;
+
 
 /************************/
 
@@ -32,7 +36,7 @@ function wait_for_jasmine(checkFx, readyFx, failFx, timeout) {
         result, condition = false;
 
     var interval = setInterval(function () {
-        console.log(".");
+        if (debug == 1) console.log(".");
 
         // success
         if (condition) {
@@ -59,16 +63,27 @@ function wait_for_jasmine(checkFx, readyFx, failFx, timeout) {
     }, 500); //< repeat check every N ms
 };
 
+// redirect webkit console.log() output
+page.onConsoleMessage = function (message) {
+    if (debug >= 2) console.log(message);
+};
+
+// cat webkit alert()
+page.onAlert = function (msg) {
+    console.log("Alert: " + msg);
+};
 
 
 page.open(url, function (status) {
-    console.log("fetch " + url + " with status: " + status);
+    if (debug >= 1) console.log("fetch " + url + " with status: " + status);
+
     if (status != 'success') {
         console.log("Failed to fetch page, give up");
         phantom.exit(1);
     }
 
-    console.log("polling MKWS jasmine test status for " + run_time + " seconds");
+    if (debug >= 1) console.log("polling MKWS jasmine test status for " + run_time + " seconds");
+
 
     var exit = wait_for_jasmine(function () {
         return page.evaluate(function () {
@@ -86,6 +101,8 @@ page.open(url, function (status) {
     },
 
     function (result) {
+        if (debug < 1) return;
+
         console.log("MKWS tests are successfully done in " + result.time / 1000 + " seconds. Hooray!");
         console.log("jasmine duration: " + result.duration);
         console.log("jasmine passing: " + result.passing);