X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=76f4834209897139a029bd3fbe8ae2b96b2dc100;hb=48e96731e9c48f770a3ee027c020a0113f703592;hp=a49598b12efdd253a21d6d56c5b8af86812b7794;hpb=76825d7130f09981564ecc733b5302ed464f4979;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index a49598b..76f4834 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");
@@ -246,6 +238,7 @@ describe("Check Termlist", function () {
         var author_number = 2; // 2=first author
         // do not click on author with numbers, e.g.: "Bower, James M. Beeman, David, 1938-"
         // do not click on author names without a comma, e.g.: "Joe Barbara"
+        // because searching on such authors won't find anything.
         var terms = $("div.mkwsFacetAuthors div.term a");
         for (var i = 0; i < terms.length; i++) {
             var term = $(terms[i]).text();
@@ -318,28 +311,29 @@ describe("Check Termlist", function () {
     });
 });
 
+
 describe("Check record list", function () {
     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 () {
+        // wait for new records
+        $("div.mkwsRecords").bind("DOMSubtreeModified propertychange", 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);
+            debug("DOM div.mkwsRecords changed");
+        });
+
+        waitsFor(function () {
+            return waitcount > 0 && $(linkaddr).length > 0;
+        }, "wait until we see a new record", 2.2 * 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(waitcount).toBeGreaterThan(0);
+            $("div.mkwsRecords").unbind("DOMSubtreeModified");
         });
     });
 });
 
-
 describe("Show record", function () {
     var record_number = 1; // the Nth record in hit list
     it("show record author", function () {
@@ -367,14 +361,13 @@ describe("Show record", function () {
 
         var urls = $("div.mkwsRecords div.record:nth-child(" + record_number + ") div table tbody tr td a");
         debug("number of extracted URL from record: " + urls.length);
-        expect(urls.length).toBeGreaterThan(0);
-
+        // expect(urls.length).toBeGreaterThan(0); // LoC has records without links
         for (var i = 0; i < urls.length; i++) {
             var url = $(urls[i]);
             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("");
         }
     });
@@ -431,9 +424,7 @@ describe("Check status client counter", function () {
             } else {
                 return false;
             }
-
         }, "wait for Active clients: 0/1", 4 * jasmine_config.second);
-
 /*
         runs(function () {
             var clients = $("div#mkwsStat span.clients");
@@ -441,9 +432,7 @@ describe("Check status client counter", function () {
             expect(clients.text()).toEqual("0/1");
         });
         */
-
     });
-
 });
 
 /* done */