X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=643b41560c920ccdd052d9c40a1886fdbf60871e;hb=aed0a7ba37956d8dae1712d5d960b1d030ddf233;hp=765980a1f0cb8e2d823122c791613071e6ee95ab;hpb=253f39e1e1a0ab1ec9491ef7f63e30f28c4ce0b7;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 765980a..643b415 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -57,6 +57,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 +72,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);
         }
@@ -122,17 +127,29 @@ describe("Check Termlist", function () {
 
         waitsFor(function () {
             return $("div#mkwsFacetSources").length == 1 ? true : false;
-        }, "check for facet sourcs", 1 * 1000);
+        }, "check for facet sources", 2 * 1000);
 
-        var sources = $("div#mkwsFacetSources");
-        debug("Termlist sources success: " + sources.length);
-        expect(sources.length).toBe(1);
 
-        var subjects = $("div#mkwsFacetSubjects");
-        expect(subjects.length).toBe(1);
+        // everything displayed?
+        runs(function () {
+            var sources = $("div#mkwsFacetSources");
+            debug("Termlist sources success: " + sources.length);
+            expect(sources.length).toBe(1);
 
-        var authors = $("div#mkwsFacetAuthors");
-        expect(authors.length).toBe(1);
+            var subjects = $("div#mkwsFacetSubjects");
+            expect(subjects.length).toBe(1);
+
+            var authors = $("div#mkwsFacetAuthors");
+            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 () {
@@ -144,7 +161,7 @@ describe("Check Termlist", function () {
 
         waitsFor(function () {
             return get_hit_counter() < hits_all_targets ? true : false;
-        }, "Search for with less hits", 9 * 1000);
+        }, "Limited author search for less than " + hits_all_targets + " hits", 8 * 1000);
 
         runs(function () {
             var hits_single_target = get_hit_counter();
@@ -176,7 +193,7 @@ describe("Check Termlist", function () {
 
         waitsFor(function () {
             return get_hit_counter() < hits_all_targets ? true : false;
-        }, "Search for with less hits", 9 * 1000);
+        }, "Limited source earch for less than " + hits_all_targets + " hits", 9 * 1000);
 
         runs(function () {
             var hits_single_target = get_hit_counter();
@@ -187,7 +204,7 @@ describe("Check Termlist", function () {
 });
 
 describe("Show record", function () {
-    var record_number = 2; // the Nth record in hit list
+    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);
@@ -197,7 +214,7 @@ describe("Show record", function () {
         waitsFor(function () {
             var show = $("div#mkwsRecords div.record:nth-child(" + record_number + ") div");
             return show != null && show.length ? true : false;
-        }, "wait some miliseconds", 2 * 1000);
+        }, "wait some miliseconds to show up a record", 2 * 1000);
 
         runs(function () {
             debug("show record pop up");
@@ -236,6 +253,7 @@ describe("Check switch menu Records/Targets", function () {
         waitsFor(function () {
             return (new Date).getTime() - time > 700 ? true : false;
         }, "wait some miliseconds", 1 * 1000);
+
         // look for table header
         runs(function () {
             expect($("div#mkwsBytarget").html()).toMatch(/Target ID/);
@@ -261,7 +279,6 @@ describe("Check status client counter", function () {
     var time = get_time();
 
     it("check status clients", function () {
-
         waitsFor(function () {
             var clients = $("div#mkwsStat span.clients");
             if (clients.length == 1 && clients.text() == "0/1") {
@@ -272,11 +289,12 @@ describe("Check status client counter", function () {
 
         }, "wait for status", 4 * 1000);
 
-    });
-    runs(function () {
-        var clients = $("div#mkwsStat span.clients");
-        debug("span.clients: " + clients.text());
-        expect(clients.text()).toEqual("0/1");
+        runs(function () {
+            var clients = $("div#mkwsStat span.clients");
+            debug("span.clients: " + clients.text());
+            expect(clients.text()).toEqual("0/1");
+        });
+
     });
 
 });