ignore all wikipedia source links, not just the first one

[mkws-moved-to-github.git] / test / spec / mkws-pazpar2.js

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index cbdfa93..e441c0b 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -209,8 +209,9 @@ describe("Check Termlist", function () {
         var hits_all_targets = get_hit_counter();
         var author_number = 2; // 2=first author
         var author_name = $("div#mkwsFacetAuthors div.term:nth-child(" + author_number + ") a").text();
-        // do not click on author with numbers, e.g.: Bower, James M. Beeman, David, 1938-
-        if (author_name.match(/[0-9].+[0-9]/)) {
+        // 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"
+        if (author_name.match(/[0-9].+[0-9]/) || !author_name.match(/,/)) {
             author_number++;
         }
 
@@ -232,10 +233,15 @@ describe("Check Termlist", function () {
     it("limit search to first source", function () {
         var hits_all_targets = get_hit_counter();
         var source_number = 2; // 2=first source
-        var source_name = $("div#mkwsFacetSources div.term:nth-child(" + source_number + ") a").text();
         // do not click on wikipedia link - no author or subject facets possible
-        if (source_name.match(/wikipedia/i)) {
-            source_number++;
+        var terms = $("div#mkwsFacetSources div.term a");
+        for (var i = 0; i < terms.length; i++) {
+            if (terms[i].text.match(/wikipedia/i)) {
+                debug("ignore source facet: " + terms[i].text);
+                source_number++;
+            } else {
+                break;
+            }
         }
 
         var click = $("div#mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click");
@@ -289,11 +295,14 @@ describe("Show record", function () {
             return;
         }
 
-        var url = $("div#mkwsRecords div.record:nth-child(" + record_number + ") div table tbody tr td a").text();
-        debug("extracted URL from record: " + url);
-
-        expect(url).not.toBe(null);
-        expect(url).toMatch(/^https?:\/\/[a-z0-9]+\.[0-9a-z].*\//i);
+        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);
+        for (var i = 0; i < urls.length; i++) {
+            debug("URL: " + urls[i].href);
+            expect(urls[i].href).not.toBe(null);
+            expect(urls[i].href).toMatch(/^https?:\/\/[a-z0-9]+\.[0-9a-z].*\//i);
+            expect(urls[i].href).toBe(urls[i].text);
+        }
     });
 });