X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=3433115646fef3542bf21b06bc77eef6d8fb8633;hb=9f5634aae3265dff242615b82419ca15f3dc3d14;hp=3756d85584e344f05b2338d33c3436835d9d5663;hpb=13ac96ec4dc4dceb307803716cfb4e6130a278d0;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 3756d85..3433115 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -28,7 +28,7 @@ function init_jasmine_config() {
 
     var jasmine_config_default = {
         search_query: "freebsd",
-        max_time: 16,
+        max_time: 17,
         // in seconds
         expected_hits: 80,
         // at least expected hit counter
@@ -36,6 +36,7 @@ function init_jasmine_config() {
         // miliseconds to seconds
         show_record_url: true,
         // check for valid URL in records
+        check_motd: true,
         dummy: false
     };
 
@@ -61,7 +62,9 @@ var get_hit_counter = function () {
 
         if (RegExp.$1) {
             hits = parseInt(RegExp.$1);
-            expect(hits).toBeGreaterThan(0);
+            if (hits <= 0) {
+                debug("Oooops in get_hit_counter: " + RegExp.$1 + " '" + found + "'");
+            }
         }
 
         //debug("Hits: " + hits);
@@ -136,6 +139,10 @@ describe("Check pazpar2 search", function () {
 
 describe("Check MOTD after search", function () {
     it("MOTD is hidden", function () {
+        if (!jasmine_config.check_motd) {
+            return;
+        }
+
         expect($(".mkwsMOTD").length).toBe(1);
         expect($(".mkwsMOTD").is(":hidden")).toBe(true);
         debug("motd t=" + $(".mkwsMOTD").text());
@@ -269,26 +276,27 @@ describe("Check Author Facets", function () {
         waitsFor(function () {
             var hits_single_target = get_hit_counter();
             return hits_single_target > 0 && hits_single_target < hits_all_targets ? true : false;
-        }, "Limited author search for less than " + hits_all_targets + " hits", 6 * jasmine_config.second);
+        }, "Limited author search for less than " + hits_all_targets + " hits", 4.5 * jasmine_config.second);
 
         runs(function () {
             var hits_single_target = get_hit_counter();
             debug("get less hits for authors: " + hits_all_targets + " > " + hits_single_target);
-            expect(hits_all_targets).toBeGreaterThan(hits_single_target);
         });
     });
+});
 
+describe("Check active clients author", function () {
     it("check for active clients after limited author search", function () {
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
-            //debug("clients: " + clients.text());
-            return clients.length == 1 && clients.text().match("/[1-9]+[0-9]+$");
-        }, "wait for Active clients: x/y", 5 * jasmine_config.second);
+            var clients = $("div.mkwsStat span.clients");
+            // debug("clients: " + clients.text());
+            return clients.length == 1 && clients.text().match("/[1-9]+[0-9]*$");
+        }, "wait for Active clients: x/y", 5.5 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
-            expect(clients.text()).toMatch("/[1-9]+[0-9]+$");
+            expect(clients.text()).toMatch("/[1-9]+[0-9]*$");
 
             // exact match of active clients (e.g. a SP misconfiguration)
             if (jasmine_config.active_clients) {
@@ -362,7 +370,7 @@ describe("Check Source Facets", function () {
 
         runs(function () {
             var hits_single_target = get_hit_counter();
-            debug("get less hits for sources: " + hits_all_targets + " > " + hits_single_target);
+            debug("get less hits for sources: " + hits_all_targets + " >= " + hits_single_target);
             expect(hits_all_targets).not.toBeLessThan(hits_single_target);
             jasmine_status.source_click = 1;
 
@@ -380,13 +388,13 @@ describe("Check record list", function () {
         }
 
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             //debug("clients: " + clients.text());
             return clients.length == 1 && clients.text().match("/1$");
         }, "wait for Active clients: x/1", 5 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("/1$");
         });
@@ -496,7 +504,7 @@ describe("Check status client counter", function () {
         }
 
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("clients: " + clients.text());
             if (clients.length == 1 && clients.text().match("0/1$")) {
                 return true;
@@ -506,7 +514,7 @@ describe("Check status client counter", function () {
         }, "wait for Active clients: 0/1", 4 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("0/1$");
         });