X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=70677daca4cbc5e13e5b395e59a07f50b99a8d7a;hb=3a8498e6853345ae30976d0876ecdb72917d331c;hp=2e0d898c0fd8a17044e94708cb8f876eca76a3a3;hpb=2e8249272985b89b9d555509d49e209f09098edc;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 2e0d898..70677da 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -297,16 +297,28 @@ 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.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";
+
+        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();
+                if (term.match(/wikipedia/i)) {
+                    debug("ignore source facet: " + term);
+                    source_number++;
+                } else {
+                    break;
+                }
             }
-        }
+            debug("Source count: " + terms.length + ", click on: " + source_number);
+        });
+
         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;
@@ -332,7 +344,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 () {