X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=4e720d9adf259b1622e1f308b6ab425f71389234;hb=20013b13f5947f4b24103156f73e02da85a3c129;hp=dd617074fe8310321d017e7ee5d079b9010a360a;hpb=5b2497081abd0c428aae974d3828b1ab740381fe;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index dd61707..4e720d9 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -4,7 +4,10 @@
  *
  */
 
-var debug = mkws.debug;
+// get references from mkws.js, lazy evaluation
+var debug = function (text) {
+        mkws.debug_function(text)
+    }
 
 var get_hit_counter = function () {
         // not yet here
@@ -43,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.service_proxy_auth;
-        }, "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");
@@ -57,6 +64,11 @@ describe("Check pazpar2 search", function () {
 });
 
 
+/*
+ * This part runs in background. It should be rewritten with
+ * async jasmine functions
+ *
+ */
 describe("Check pazpar2 navigation", function () {
     // Asynchronous part
     it("check running search next/prev", function () {
@@ -67,7 +79,7 @@ describe("Check pazpar2 navigation", function () {
                 debug("trigger click on id: " + id);
                 var click = $(id).trigger("click");
 
-                debug("next click is success: " + click.length);
+                debug("next/prev: " + id + " click is success: " + click.length);
                 expect(click.length).toBe(1);
             }, time * 1000);
         }
@@ -124,6 +136,8 @@ describe("Check Termlist", function () {
             return $("div#mkwsFacetSources").length == 1 ? true : false;
         }, "check for facet sources", 2 * 1000);
 
+
+        // everything displayed?
         runs(function () {
             var sources = $("div#mkwsFacetSources");
             debug("Termlist sources success: " + sources.length);
@@ -136,6 +150,13 @@ describe("Check Termlist", function () {
             expect(authors.length).toBe(1);
         });
 
+        waitsFor(function () {
+            return $("div#mkwsFacetAuthors div.term").length >= 2 ? true : false;
+        }, "At least one author link displayed", 2 * 1000);
+
+        runs(function () {
+            expect($("div#mkwsFacetAuthors div.term").length).toBeGreaterThan(1);
+        });
     });
 
     it("limit search to first author", function () {
@@ -170,16 +191,18 @@ describe("Check Termlist", function () {
         expect(click.length).toBe(1);
 
         waitsFor(function () {
-            if ($("div#mkwsNavi").length && $("div#mkwsNavi").text().match(/^Source/)) {
+            if ($("div#mkwsNavi").length && $("div#mkwsNavi").text().match(/Source: /)) {
                 return true;
             } else {
                 return false;
             }
         }, "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();
@@ -192,8 +215,8 @@ 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");
-        debug("show click is success: " + click.length);
+        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);
 
         // wait until the record pops up
@@ -209,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);
 
@@ -227,7 +255,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
@@ -248,7 +276,7 @@ describe("Check switch menu Records/Targets", function () {
 
     it("switch back to record view", function () {
         var click = $("a#mkwsSwitch_records").trigger("click");
-        debug("record click is success: " + click.length);
+        debug("record view click is success: " + click.length);
         expect(click.length).toBe(1);
 
         // now the target table must be visible
@@ -267,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");
         });
+        */
 
     });