X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=002a7056693ff822d46af74511b1cb8b78be9fea;hb=53dc53783dfabd95a00a1a06472fe0982fa4ebf0;hp=898ae06c2a02c8e1f974d2b26cadd2bdc8ba0bdc;hpb=7bcd054bbf692e5eafe62fa72b1fa8fef7c92c51;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 898ae06..002a705 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -5,27 +5,27 @@
  */
 
 // get references from mkws.js, lazy evaluation
-var debug = function () {  mkws.debug_level; }
-var debug_level = function () { mkws.debug_function }
+var debug = function (text) {
+        mkws.debug_function(text)
+    }
 
 var get_hit_counter = function () {
-    // not yet here
-    if ($("#mkwsPager").length == 0)
-        return -1;
-
-    var found = $("#mkwsPager").text();
-    var re = /\([A-Za-z]+:\s+([0-9]+)\)/;
-    re.exec(found);
-    var hits = -1;
-
-    if (RegExp.$1) {
-        hits = parseInt(RegExp.$1);
-        expect(hits).toBeGreaterThan(0);
-    }
+        // not yet here
+        if ($("#mkwsPager").length == 0) return -1;
+
+        var found = $("#mkwsPager").text();
+        var re = /\([A-Za-z]+:\s+([0-9]+)\)/;
+        re.exec(found);
+        var hits = -1;
 
-    //debug("Hits: " + hits);
-    return hits;
-}
+        if (RegExp.$1) {
+            hits = parseInt(RegExp.$1);
+            expect(hits).toBeGreaterThan(0);
+        }
+
+        //debug("Hits: " + hits);
+        return hits;
+    }
 
 describe("Check pazpar2 search", function () {
     it("pazpar2 was successfully initialize", function () {
@@ -46,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");
@@ -226,6 +230,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);
 
@@ -292,7 +301,7 @@ describe("Check status client counter", function () {
 
         }, "wait for Active clients: 0/1", 4 * 1000);
 
-        /*
+/*
         runs(function () {
             var clients = $("div#mkwsStat span.clients");
             debug("span.clients: " + clients.text());