if running as raw pp2, don't wait for mkws auth, MKWS-82

[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 404c145..0a800c3 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");
@@ -207,7 +213,7 @@ describe("Check Termlist", function () {
 describe("Show record", function () {
     var record_number = 1; // the Nth record in hit list
     it("show record author", function () {
-        var click = $("div#mkwsRecords div.record:nth-child(" + record_number + ") :nth-child(2)").trigger("click");
+        var click = $("div#mkwsRecords div.record:nth-child(" + record_number + ") a").trigger("click");
         debug("show record click is success: " + click.length);
         expect(click.length).toBe(1);
 
@@ -242,7 +248,7 @@ describe("Check switch menu Records/Targets", function () {
 
     it("switch to target view", function () {
         var click = $("a#mkwsSwitch_targets").trigger("click");
-        debug("target click is success: " + click.length);
+        debug("target view click is success: " + click.length);
         expect(click.length).toBe(1);
 
         // now the target table must be visible
@@ -282,19 +288,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");
         });
+        */
 
     });