X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=dd7a2abb7ce2826b0b7b696b1a80ba2e6994b26b;hb=ca6f73053a08da415a02b697ae8bcfd5bf676c3a;hp=e441c0b24533de34f6c46e9640bca736d71c58f3;hpb=e6855cd2f0cc9bb75c0d247f36c61d768480c86a;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index e441c0b..dd7a2ab 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -42,6 +42,8 @@ function init_jasmine_config() {
         }
         debug("jasmine config: " + key + " => " + jasmine_config[key]);
     }
+
+    mkws.jasmine_done = false;
 }
 
 var get_hit_counter = function () {
@@ -180,7 +182,7 @@ describe("Check Termlist", function () {
 
         waitsFor(function () {
             return $("div#mkwsFacetSources").length == 1 ? true : false;
-        }, "check for facet sources", 2 * jasmine_config.second);
+        }, "check for facet sources", 4 * jasmine_config.second);
 
 
         // everything displayed?
@@ -208,11 +210,17 @@ describe("Check Termlist", function () {
     it("limit search to first author", 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-"
         // 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++;
+        var terms = $("div#mkwsFacetAuthors div.term a");
+        for (var i = 0; i < terms.length; i++) {
+            var term = $(terms[i]).text();
+            if (term.match(/[0-9].+[0-9]/i) || !term.match(/,/)) {
+                debug("ignore author facet: " + term);
+                author_number++;
+            } else {
+                break;
+            }
         }
 
         var click = $("div#mkwsFacetAuthors div.term:nth-child(" + author_number + ") a").trigger("click");
@@ -236,8 +244,9 @@ describe("Check Termlist", function () {
         // do not click on wikipedia link - no author or subject facets possible
         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);
+            var term = $(terms[i]).text();
+            if (term.match(/wikipedia/i)) {
+                debug("ignore source facet: " + term);
                 source_number++;
             } else {
                 break;
@@ -298,10 +307,11 @@ 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);
         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);
+            var url = $(urls[i]);
+            debug("URL: " + url.attr('href'));
+            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());
         }
     });
 });
@@ -376,7 +386,10 @@ describe("Check status client counter", function () {
 
 });
 
-/* dummy EOF */
+/* done */
 describe("All tests are done", function () {
-    it(">>> hooray <<<", function () {});
+    it(">>> hooray <<<", function () {
+        mkws.jasmine_done = true;
+    });
 });
+