expect at least one hit while waiting for less hits for an limit source search

[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 67c769c..c97cea7 100644 (file)
--- 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 () {
@@ -296,7 +297,7 @@ describe("Check Termlist", function () {
         var hits_all_targets = get_hit_counter();
         var source_number = 2; // 2=first source
         // do not click on wikipedia link - no author or subject facets possible
-        var terms = $("div.mkwsFacetSources div.term a");
+        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)) {
@@ -306,12 +307,12 @@ describe("Check Termlist", function () {
                 break;
             }
         }
-        if ($("div.mkwsFacetSources div.term:nth-child(" + source_number + ") a").text().length == 0) {
+        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.mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click");
+        $("div.mkwsFacet[data-mkws-facet='xtargets'] div.term:nth-child(" + source_number + ") a").trigger("click");
 
         // wait for a stat response
         var waitcount = 0;
@@ -331,7 +332,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 () {