X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=452b8e889cdc3d17b841edd28af9966d9eb69ed8;hb=54a9ceaf097406792d0dec3ef8079756ff35624f;hp=4c26dab41a8ce5259d602ac531913265ef7509b6;hpb=6ee57ca3d7fbf96d3e9e6668f8cc70b61f88164c;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 4c26dab..452b8e8 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -135,7 +135,7 @@ 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 " + $(".mkwsMOTD"));
         debug("motd t=" + $(".mkwsMOTD").text());
         debug("motd v=" + $(".mkwsMOTD").is(":visible"));
         //expect($("div.mkwsBytarget").is(":visible")).toBe(true);
@@ -246,6 +246,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();
@@ -289,6 +290,10 @@ describe("Check Termlist", function () {
                 break;
             }
         }
+        if ($("div.mkwsFacetSources div.term:nth-child(" + source_number + ") a").text().length == 0) {
+            debug("No good source found. Not clicking on the bad ones");
+            return;
+        }
 
         $("div.mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click");
 
@@ -314,12 +319,12 @@ describe("Check Termlist", function () {
     });
 });
 
-describe("Show record", function () {
-    var record_number = 1; // the Nth record in hit list
-    it("show record author", 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 () {
             waitcount++;
             debug("waiting for the link " + waitcount + " " + $(linkaddr) + " =" + $(linkaddr).length + " " + $(linkaddr).text());
@@ -330,8 +335,18 @@ describe("Show record", function () {
             var link = $(linkaddr);
             debug("== waited (" + waitcount + ") for the link..." + $(linkaddr) + " =" + $(linkaddr).length + " " + $(linkaddr).text());
             expect(link.length).toBe(1);
-            link.trigger("click");
+            // link.trigger("click");
         });
+    });
+});
+
+
+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 + ") a").trigger("click");
+        debug("show record click is success: " + click.length);
+        expect(click.length).toBe(1);
 
         // wait until the record pops up
         waitsFor(function () {
@@ -351,14 +366,17 @@ describe("Show record", function () {
             return;
         }
 
-        var urls = $("div#mkwsRecords div.record:nth-child(" + record_number + ") div table tbody tr td a");
+        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);
+
         for (var i = 0; i < urls.length; i++) {
             var url = $(urls[i]);
-            debug("URL: " + url.attr('href'));
+            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')).toBe(url.text());
+            expect(url.text()).not.toBe("");
         }
     });
 });