lazy evaluation of mkws.js objects, part of MKWS-50

[mkws-moved-to-github.git] / test / spec / mkws-pazpar2.js

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 7d8a563..898ae06 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -4,26 +4,29 @@
  *
  */
 
-var debug = mkws.debug;
+// get references from mkws.js, lazy evaluation
+var debug = function () {  mkws.debug_level; }
+var debug_level = function () { mkws.debug_function }
 
 var get_hit_counter = function () {
-        // not yet here
-        if ($("#mkwsPager").length == 0) return -1;
-
-        var found = $("#mkwsPager").text();
-        var re = /\([A-Za-z]+:\s+([0-9]+)\)/;
-        re.exec(found);
-        var hits = -1;
-
-        if (RegExp.$1) {
-            hits = parseInt(RegExp.$1);
-            expect(hits).toBeGreaterThan(0);
-        }
-
-        //debug("Hits: " + hits);
-        return hits;
+    // not yet here
+    if ($("#mkwsPager").length == 0)
+        return -1;
+
+    var found = $("#mkwsPager").text();
+    var re = /\([A-Za-z]+:\s+([0-9]+)\)/;
+    re.exec(found);
+    var hits = -1;
+
+    if (RegExp.$1) {
+        hits = parseInt(RegExp.$1);
+        expect(hits).toBeGreaterThan(0);
     }
 
+    //debug("Hits: " + hits);
+    return hits;
+}
+
 describe("Check pazpar2 search", function () {
     it("pazpar2 was successfully initialize", function () {
         expect(mkws_config.error).toBe(undefined);
@@ -45,7 +48,7 @@ describe("Check pazpar2 search", function () {
 
         // wait for service proxy auth
         waitsFor(function () {
-            return mkws.service_proxy_auth;
+            return mkws.authenticated;
         }, "SP auth done", 10 * 1000);
 
         runs(function () {
@@ -57,6 +60,11 @@ describe("Check pazpar2 search", function () {
 });
 
 
+/*
+ * This part runs in background. It should be rewritten with
+ * async jasmine functions
+ *
+ */
 describe("Check pazpar2 navigation", function () {
     // Asynchronous part
     it("check running search next/prev", function () {
@@ -67,7 +75,7 @@ describe("Check pazpar2 navigation", function () {
                 debug("trigger click on id: " + id);
                 var click = $(id).trigger("click");
 
-                debug("next click is success: " + click.length);
+                debug("next/prev: " + id + " click is success: " + click.length);
                 expect(click.length).toBe(1);
             }, time * 1000);
         }
@@ -179,7 +187,7 @@ describe("Check Termlist", function () {
         expect(click.length).toBe(1);
 
         waitsFor(function () {
-            if ($("div#mkwsNavi").length && $("div#mkwsNavi").text().match(/^Source/)) {
+            if ($("div#mkwsNavi").length && $("div#mkwsNavi").text().match(/Source: /)) {
                 return true;
             } else {
                 return false;
@@ -201,8 +209,8 @@ describe("Check Termlist", function () {
 describe("Show record", function () {
     var record_number = 1; // the Nth record in hit list
     it("show record author", function () {
-        var click = $("div#mkwsRecords div.record:nth-child(" + record_number + ") :nth-child(2)").trigger("click");
-        debug("show click is success: " + click.length);
+        var click = $("div#mkwsRecords div.record:nth-child(" + record_number + ") a").trigger("click");
+        debug("show record click is success: " + click.length);
         expect(click.length).toBe(1);
 
         // wait until the record pops up
@@ -236,7 +244,7 @@ describe("Check switch menu Records/Targets", function () {
 
     it("switch to target view", function () {
         var click = $("a#mkwsSwitch_targets").trigger("click");
-        debug("target click is success: " + click.length);
+        debug("target view click is success: " + click.length);
         expect(click.length).toBe(1);
 
         // now the target table must be visible
@@ -257,7 +265,7 @@ describe("Check switch menu Records/Targets", function () {
 
     it("switch back to record view", function () {
         var click = $("a#mkwsSwitch_records").trigger("click");
-        debug("record click is success: " + click.length);
+        debug("record view click is success: " + click.length);
         expect(click.length).toBe(1);
 
         // now the target table must be visible
@@ -276,19 +284,21 @@ describe("Check status client counter", function () {
     it("check status clients", function () {
         waitsFor(function () {
             var clients = $("div#mkwsStat span.clients");
-            if (clients.length == 1 && clients.text() == "0/1") {
+            if (clients.length == 1 && clients.text().match("0/1$")) {
                 return true;
             } else {
                 return false;
             }
 
-        }, "wait for status", 4 * 1000);
+        }, "wait for Active clients: 0/1", 4 * 1000);
 
+        /*
         runs(function () {
             var clients = $("div#mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toEqual("0/1");
         });
+        */
 
     });