X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=9981ccccff382b4e3b945ceb17d6d8359c6c95df;hb=12edf367d96791fbcac972c8e1993fc69f0c16ad;hp=7e180c31cd8060983cef76bcc9e0b5facbcde367;hpb=629f916bd15890ad6ac22d79fe45dbbd0286620c;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 7e180c3..9981ccc 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();
@@ -321,6 +314,7 @@ describe("Check Termlist", function () {
 
 describe("Check record list", function () {
     it("got a record", function () {
+        var linkaddr = "div.mkwsRecords div.record:nth-child(1) a";
         var waitcount = 0;
 
         // wait for new records
@@ -330,18 +324,16 @@ describe("Check record list", function () {
         });
 
         waitsFor(function () {
-            return waitcount;
-        }, "wait until we see a record", 1.5 * jasmine_config.second);
+            return waitcount > 0 && $(linkaddr).length > 0;
+        }, "wait until we see a new record", 2.2 * jasmine_config.second);
 
         runs(function () {
             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 () {
@@ -432,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");
@@ -442,9 +432,7 @@ describe("Check status client counter", function () {
             expect(clients.text()).toEqual("0/1");
         });
         */
-
     });
-
 });
 
 /* done */