wait only 5 seconds for limited 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 cce2bb7..4e720d9 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -4,8 +4,10 @@
  *
  */
 
-var debug_level = mkws.debug_level;
-var debug = mkws.debug_function;
+// get references from mkws.js, lazy evaluation
+var debug = function (text) {
+        mkws.debug_function(text)
+    }
 
 var get_hit_counter = function () {
         // not yet here
@@ -44,10 +46,14 @@ describe("Check pazpar2 search", function () {
         debug("set search query: " + search_query)
         expect($("input#mkwsQuery").val()).toMatch("^" + search_query + "$");
 
-        // wait for service proxy auth
-        waitsFor(function () {
-            return mkws.authenticated;
-        }, "SP auth done", 10 * 1000);
+        if (mkws_config.use_service_proxy) {
+            // wait for service proxy auth
+            waitsFor(function () {
+                return mkws.authenticated;
+            }, "SP auth done", 10 * 1000);
+        } else {
+            debug("running raw pp2, don't wait for mkws auth");
+        }
 
         runs(function () {
             debug("Click on submit button");
@@ -192,9 +198,11 @@ describe("Check Termlist", function () {
             }
         }, "Search for source in navi bar", 1000);
 
+       // 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 get_hit_counter() < hits_all_targets ? true : false;
-        }, "Limited source earch for less than " + hits_all_targets + " hits", 9 * 1000);
+        }, "Limited source search for less than " + hits_all_targets + " hits", 5 * 1000);
 
         runs(function () {
             var hits_single_target = get_hit_counter();
@@ -224,6 +232,11 @@ describe("Show record", function () {
     });
 
     it("extract URL", function () {
+        if (mkws_config.jasmine && mkws_config.jasmine.show_record_url == false) {
+            debug("ignore test for URL in record")
+            return;
+        }
+
         var url = $("div#mkwsRecords div.record:nth-child(" + record_number + ") div table tbody tr td a").text();
         debug("extracted URL from record: " + url);
 
@@ -282,19 +295,21 @@ describe("Check status client counter", function () {
     it("check status clients", function () {
         waitsFor(function () {
             var clients = $("div#mkwsStat span.clients");
-            if (clients.length == 1 && clients.text() == "0/1") {
+            if (clients.length == 1 && clients.text().match("0/1$")) {
                 return true;
             } else {
                 return false;
             }
 
-        }, "wait for status", 4 * 1000);
+        }, "wait for Active clients: 0/1", 4 * 1000);
 
+/*
         runs(function () {
             var clients = $("div#mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toEqual("0/1");
         });
+        */
 
     });