X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fphantom%2Fevaluate.js;h=db00c4b52ff11fdd35788bb139fa3a4801c80874;hb=173bbc2175cd06ca030201ef2eb7b5a206d5cb08;hp=be26202491d09ca8aa5331a527f2fb18e310ad23;hpb=751f456c8754f1adeada606b404cd0f54b367cbc;p=mkws-moved-to-github.git

diff --git a/test/phantom/evaluate.js b/test/phantom/evaluate.js
index be26202..db00c4b 100644
--- a/test/phantom/evaluate.js
+++ b/test/phantom/evaluate.js
@@ -1,7 +1,7 @@
 /*
     Fetch a mkws/jasmine based page into node.js, evaluate the page and check if test status
     This should make it possible to run the test on the command line in jenkins.  e.g.:
-    
+
       phantomjs evaluate.js https://mkws-dev.indexdata.com/jasmine-local-popup.html
 */
 
@@ -19,38 +19,91 @@ page.viewportSize = {
     height: 1000
 };
 
-var run_time = 12; // poll up to seconds
+var run_time = 8; // poll up to seconds
+if (system.args[2] && parseFloat(system.args[2]) > 0){
+    run_time = parseFloat(system.args[2] );
+}
+
+/************************/
+
+function wait_for_jasmine(checkFx, readyFx, failFx, timeout) {
+    var max_timeout = timeout ? timeout : run_time * 1000,
+        start = new Date().getTime(),
+        result,
+        condition = false;
+
+    var interval = setInterval(function() {
+        console.log(".");
+
+        // success
+        if (condition) {
+            // console.log("'waitFor()' finished in " + (new Date().getTime() - start) + "ms.");
+            result.time = (new Date().getTime() - start);
+            readyFx(result);
+            clearInterval(interval);
+            phantom.exit(0);
+        }
+
+        // timeout
+        else if ( new Date().getTime() - start >= max_timeout ) {
+            result.time = (new Date().getTime() - start);
+            failFx(result);
+            phantom.exit(1);
+        }
+
+        // checking
+        else {
+            result = checkFx();
+            if (result)
+                condition = result.mkws.jasmine_done;
+        }
+
+    }, 500); //< repeat check every N ms
+};
+
+
+
 page.open(url, function (status) {
     console.log("fetch " + url + " with status: " + status);
-    console.log("polling MKWS test status...");
+    if (status != 'success') {
+        console.log("Failed to fetch page, give up");
+        phantom.exit(1);
+    }
 
-    var r;
-    for (var i = 1; i <= run_time; i++) {
-        setTimeout(function () {
-            var result = page.evaluate(function (s) {
-                // return document.querySelector(s).innerText;
+    console.log("polling MKWS jasmine test status for " + run_time + " seconds");
+
+    var exit = wait_for_jasmine(function () {
+        return page.evaluate(function () {
+            if (!window || !window.$ || !window.mkws) {
+                return false;
+            } else {
                 return {
                     mkws: window.mkws,
-                    string: "foo"
+                    html: window.$("html").html(),
+                    duration: window.$(".duration").text(),
+                    passing: window.$(".passingAlert").text()
                 };
-            }, 'title');
-
-            console.log(".");
-            if (result.mkws.jasmine_done) {
-                console.log("MKWS tests are successfully done. Hooray!");
-                phantom.exit(0);
             }
-            r = result;
-        }, i * 1000);
-    }
+        })},
 
+        function(result) {
+            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);
+        },
 
-    setTimeout(function () {
-        var error_png = "./mkws-error.png";
-        console.log("MKWS tests failed after " + run_time + " seconds");
-        console.log("keep screenshot in '" + error_png + "'");
+        function (result) {
+            var error_png = "./mkws-error.png";
+            var error_html = "./mkws-error.html";
 
-        page.render(error_png);
-        phantom.exit(1);
-    }, (run_time + 1) * 1000);
+            console.log("MKWS tests failed after " + result.time/1000 + " seconds");
+            console.log("keep screenshot in '" + error_png + "'");
+            page.render(error_png);
+
+            console.log("keep html DOM in '" + error_html + "'");
+            var html = result.html + "\n\n<!-- mkws: " + JSON.stringify(result.mkws) + " -->\n";
+            var fs = require('fs');
+            fs.write(error_html, html, "wb");
+        },
+        run_time * 1000);
 });