submit search after SP auth was done

[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 772127d..6179912 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -6,11 +6,11 @@
 
 var debug = mkws.debug;
 
-function get_hit_counter() {
+var get_hit_counter = function () {
     if ($("#mkwsPager").length == 0) return -1;
 
     var found = $("#mkwsPager").text();
-    var re = /found: ([0-9]+)/;
+    var re = /\([A-Za-z]+:\s+([0-9]+)\)/;
     re.exec(found);
     var hits = -1;
 
@@ -37,12 +37,22 @@ describe("Check pazpar2 search", function () {
     });
 
     it("run search query", function () {
-        $("input#mkwsQuery").val("freebsd");
-        expect($("input#mkwsQuery").val()).toMatch(/^freebsd$/);
+       var search_query = "freebsd"; // short hit counter with some paging
 
-        setTimeout(function () {
-            $("input#mkwsButton").trigger("click");
-        }, 3 * 1000);
+        $("input#mkwsQuery").val(search_query);
+       debug("set search query: " + search_query)
+        expect($("input#mkwsQuery").val()).toMatch("^" + search_query + "$");
+
+       // wait for service proxy auth
+       waitsFor(function () {
+            return mkws.service_proxy_auth;
+        }, "SP auth done", 10 * 1000);
+
+        runs(function () {
+           debug("Submit search");
+            var click = $("input#mkwsButton").trigger("click");
+           expect(click.length == 1).toBe(true);
+        })
     });
 });