X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=78f6f12a64e582afd0e07048a7589a3dd7ce7d63;hb=dc511ecf30c67726bb5f5b0538c20549e43f2b4d;hp=0486f554c91b67cac3886a63faec81d469c4083b;hpb=3f5558d6bdfdcae2a3660eb55bf29d656616bb33;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 0486f55..78f6f12 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -92,8 +92,6 @@ describe("Check MOTD before search", function () {
         expect($(".mkwsMOTDContainer").length).toBe(1);
         expect($(".mkwsMOTDContainer").text()).toMatch(/MOTD/);
     });
-
-
 });
 
 describe("Check pazpar2 search", function () {
@@ -135,15 +133,12 @@ describe("Check MOTD after search", function () {
     it("MOTD is hidden", function () {
         expect($(".mkwsMOTD").length).toBe(1);
         expect($(".mkwsMOTD").is(":hidden")).toBe(true);
-        //debug("motd " + $(".mkwsMOTD"));
         debug("motd t=" + $(".mkwsMOTD").text());
         debug("motd v=" + $(".mkwsMOTD").is(":visible"));
-        //expect($("div.mkwsBytarget").is(":visible")).toBe(true);
     });
 });
 
 
-
 /*
  * This part runs in background. It should be rewritten with
  * async jasmine functions
@@ -190,11 +185,9 @@ describe("Check pazpar2 hit counter", function () {
 
         waitsFor(function () {
             hits = get_hit_counter();
-
             return hits > expected_hits;
         }, "Expect " + expected_hits + " hits", max_time * jasmine_config.second);
 
-
         runs(function () {
             debug("mkws pager found records: '" + hits + "'");
             expect($(".mkwsPager").length).toBe(1);
@@ -213,7 +206,6 @@ describe("Check Termlist", function () {
             return $("div.mkwsFacetSources").length == 1 ? true : false;
         }, "check for facet sources", 4 * jasmine_config.second);
 
-
         // everything displayed?
         runs(function () {
             var sources = $("div.mkwsFacetSources");
@@ -297,6 +289,13 @@ describe("Check Termlist", function () {
 
         $("div.mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click");
 
+        // wait for a stat response
+        var waitcount = 0;
+        $(".mkwsPager").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () {
+            waitcount++;
+            debug("DOM wait for stat: " + waitcount);
+        });
+
         waitsFor(function () {
             if ($("div.mkwsNavi").length && $("div.mkwsNavi").text().match(/(Source|datenquelle|kilder): /i)) {
                 return true;
@@ -308,39 +307,50 @@ describe("Check Termlist", function () {
         // Note: it may happens that limited source search returns the same number of hits
         // as before. Thats not really an error, but unfortunate
         waitsFor(function () {
-            return get_hit_counter() <= hits_all_targets ? true : false;
+            return waitcount >= 2 && get_hit_counter() <= hits_all_targets ? true : false;
         }, "Limited source search for less than " + hits_all_targets + " hits", 5 * jasmine_config.second);
 
         runs(function () {
             var hits_single_target = get_hit_counter();
             debug("get less hits for sources: " + hits_all_targets + " > " + hits_single_target);
             expect(hits_all_targets).not.toBeLessThan(hits_single_target);
+
+            $(".mkwsPager").unbind("DOMNodeInserted DOMNodeRemoved propertychange");
         });
     });
 });
 
+
 describe("Check record list", function () {
+    it("check for single active client", function () {
+        waitsFor(function () {
+            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");
+            debug("span.clients: " + clients.text());
+            expect(clients.text()).toMatch("/1$");
+        });
+    });
+
     it("got a record", function () {
-        // make sure we have a link.
         var linkaddr = "div.mkwsRecords div.record:nth-child(1) a";
-        var waitcount = 0;
 
         waitsFor(function () {
-            waitcount++;
-            debug("waiting for the link " + waitcount + " " + $(linkaddr) + " =" + $(linkaddr).length + " " + $(linkaddr).text());
-            return ($(linkaddr).length > 0);
-        }, "wait until we see a link", 1 * jasmine_config.second);
+            // remove + insert node: must be at least 2
+            return $(linkaddr).length > 0;
+        }, "wait until we see a new record", 2.5 * jasmine_config.second);
 
         runs(function () {
-            var link = $(linkaddr);
-            debug("== waited (" + waitcount + ") for the link..." + $(linkaddr) + " =" + $(linkaddr).length + " " + $(linkaddr).text());
-            expect(link.length).toBe(1);
-            // link.trigger("click");
+            expect($(linkaddr).length).toBeGreaterThan(0);
         });
     });
 });
 
-
 describe("Show record", function () {
     var record_number = 1; // the Nth record in hit list
     it("show record author", function () {
@@ -350,7 +360,9 @@ describe("Show record", function () {
 
         // wait until the record pops up
         waitsFor(function () {
-            var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") div");
+            var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") > div.details");
+            debug("poprecord: " + (show ? show.length : -1) + " " + $("div.mkwsRecords div.record").text());
+
             return show != null && show.length ? true : false;
         }, "wait some miliseconds to show up a record", 2 * jasmine_config.second);
 
@@ -374,7 +386,7 @@ describe("Show record", function () {
             debug("URL: " + url.attr('href') + " text: " + url.text());
 
             expect(url.attr('href')).not.toBe(null);
-            expect(url.attr('href')).toMatch(/^https?:\/\/[a-z0-9]+\.[0-9a-z].*\//i);
+            expect(url.attr('href')).toMatch(/^https?:\/\/[a-z0-9\-]+\.[0-9a-z].*\//i);
             expect(url.text()).not.toBe("");
         }
     });
@@ -426,24 +438,20 @@ describe("Check status client counter", function () {
     it("check status clients", function () {
         waitsFor(function () {
             var clients = $("div#mkwsStat span.clients");
+            debug("clients: " + clients.text());
             if (clients.length == 1 && clients.text().match("0/1$")) {
                 return true;
             } else {
                 return false;
             }
-
         }, "wait for Active clients: 0/1", 4 * jasmine_config.second);
 
-/*
         runs(function () {
             var clients = $("div#mkwsStat span.clients");
             debug("span.clients: " + clients.text());
-            expect(clients.text()).toEqual("0/1");
+            expect(clients.text()).toMatch("0/1$");
         });
-        */
-
     });
-
 });
 
 /* done */