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

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index cdc3a68..b8fa81d 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -262,7 +262,8 @@ describe("Check Termlist", function () {
         $("div.mkwsFacet[data-mkws-facet='author'] div.term:nth-child(" + author_number + ") a").trigger("click");
 
         waitsFor(function () {
-            return get_hit_counter() < hits_all_targets ? true : false;
+            var hits_single_target = get_hit_counter();
+            return hits_single_target > 0 && hits_single_target < hits_all_targets ? true : false;
         }, "Limited author search for less than " + hits_all_targets + " hits", 6 * jasmine_config.second);
 
         runs(function () {
@@ -295,29 +296,45 @@ 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
+        // wait for a stat response
+        var waitcount = 0;
         // do not click on wikipedia link - no author or subject facets possible
-        var terms = $("div.mkwsFacet[data-mkws-facet='xtargets'] div.term a");
-        for (var i = 0; i < terms.length; i++) {
-            var term = $(terms[i]).text();
-            if (term.match(/wikipedia/i)) {
-                debug("ignore source facet: " + term);
-                source_number++;
-            } else {
-                break;
+        var link = "div.mkwsFacet[data-mkws-facet='xtargets'] div.term a";
+
+        // wait for a visible source link in facets
+        waitsFor(function () {
+            var terms = $(link);
+            return terms && terms.length > 0;
+        }, "wait for source facets after author search", 5 * jasmine_config.second);
+
+
+        runs(function () {
+            var terms = $(link);
+            for (var i = 0; i < terms.length; i++) {
+                var term = $(terms[i]).text();
+                debug("check for good source: " + term);
+
+                if (term.match(/wikipedia/i)) {
+                    debug("ignore source facet: " + term);
+                    source_number++;
+                } else {
+                    break;
+                }
+            }
+            debug("Source counter: " + terms.length + ", select: " + (source_number - 1));
+
+            if ($("div.mkwsFacet[data-mkws-facet='xtargets'] div.term:nth-child(" + source_number + ") a").text().length == 0) {
+                debug("No good source found. Not clicking on the bad ones");
+                return;
             }
-        }
-        if ($("div.mkwsFacet[data-mkws-facet='xtargets'] div.term:nth-child(" + source_number + ") a").text().length == 0) {
-            debug("No good source found. Not clicking on the bad ones");
-            return;
-        }
 
-        $("div.mkwsFacet[data-mkws-facet='xtargets'] div.term:nth-child(" + source_number + ") a").trigger("click");
+            debug("click on source link nth-child(): " + source_number);
+            $("div.mkwsFacet[data-mkws-facet='xtargets'] div.term:nth-child(" + source_number + ") a").trigger("click");
 
-        // wait for a stat response
-        var waitcount = 0;
-        $(".mkwsPager").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () {
-            waitcount++;
-            debug("DOM wait for stat: " + waitcount);
+            $(".mkwsPager").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () {
+                waitcount++;
+                debug("DOM wait for stat: " + waitcount);
+            });
         });
 
         waitsFor(function () {
@@ -331,7 +348,9 @@ describe("Check Termlist", function () {
         // Note: it may happens that limited source search returns the same number of hits
         // as before. Thats not really an error, but unfortunate
         waitsFor(function () {
-            return waitcount >= 2 && get_hit_counter() <= hits_all_targets ? true : false;
+            var hits_single_target = get_hit_counter();
+
+            return waitcount >= 2 && hits_single_target > 0 && hits_single_target <= hits_all_targets ? true : false;
         }, "Limited source search for less than " + hits_all_targets + " hits", 5 * jasmine_config.second);
 
         runs(function () {