reorder tests: first limit by author, than by sources

[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 9a5746f..fa695bc 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -73,7 +73,7 @@ describe("Check pazpar2 navigation", function () {
 
         waitsFor(function () {
             return $("div#mkwsPager div:nth-child(2) a").length >= 2 ? true : false;
-        }, "Expect next link 2", 5 * 1000);
+        }, "Expect next link 2", 10 * 1000);
 
         runs(function () {
             // click next/prev after N seconds
@@ -94,15 +94,15 @@ describe("Check pazpar2 navigation", function () {
 
 describe("Check pazpar2 hit counter", function () {
     it("check running search hit counter", function () {
-        var max_time = 10; // in seconds
-        var expected_hits = 116; // at least expected hit counter
+        var max_time = 16; // in seconds
+        var expected_hits = 80; // at least expected hit counter
         var hits = 0;
 
         waitsFor(function () {
             hits = get_hit_counter();
 
-            return hits >= expected_hits;
-        }, "Expect N hits in x seconds", max_time * 1000);
+            return hits > expected_hits;
+        }, "Expect " + expected_hits + " hits", max_time * 1000);
 
 
         runs(function () {
@@ -114,13 +114,6 @@ describe("Check pazpar2 hit counter", function () {
 });
 
 describe("Check Termlist", function () {
-    function show_record() {
-        var click = $("div#mkwsRecords div.record:nth-child(3) :nth-child(2)").trigger("click");
-        debug("show click is success: " + click.length);
-        expect(click.length == 1).toBe(true);
-    }
-
-    // show_record();
     it("found Termlist", function () {
         var termlist = $("div#mkwsTermlists");
         debug("Termlist success: " + termlist.length);
@@ -136,6 +129,24 @@ describe("Check Termlist", function () {
         expect(authors.length == 1).toBe(true);
     });
 
+    it("limit search to first author", function () {
+        var hits_all_targets = get_hit_counter();
+
+        var click = $("div#mkwsFacetAuthors div.term:nth-child(2) a").trigger("click");
+        debug("limit author click is success: " + click.length);
+        expect(click.length == 1).toBe(true);
+
+        waitsFor(function () {
+            return get_hit_counter() < hits_all_targets ? true : false;
+        }, "Search for with less hits", 9 * 1000);
+
+        runs(function () {
+            var hits_single_target = get_hit_counter();
+            debug("get less hits for authors: " + hits_all_targets + " > " + hits_single_target);
+            expect(hits_all_targets).toBeGreaterThan(hits_single_target);
+        });
+    });
+
     it("limit search to first source", function () {
         var hits_all_targets = get_hit_counter();
 
@@ -161,56 +172,33 @@ describe("Check Termlist", function () {
             expect(hits_all_targets).toBeGreaterThan(hits_single_target);
         });
     });
+});
 
-    it("limit search to first author", function () {
-        var hits_all_targets = get_hit_counter();
-
-        var click = $("div#mkwsFacetAuthors div.term:nth-child(2) a").trigger("click");
-        debug("limit author click is success: " + click.length);
+describe("Show record", function () {
+    it("show record author", function () {
+        var click = $("div#mkwsRecords div.record:nth-child(3) :nth-child(2)").trigger("click");
+        debug("show click is success: " + click.length);
         expect(click.length == 1).toBe(true);
 
+        // wait until the record pops up
         waitsFor(function () {
-            return get_hit_counter() < hits_all_targets ? true : false;
-        }, "Search for with less hits", 9 * 1000);
+            var show = $("div#mkwsRecords div.record:nth-child(3) div");
+            return show != null && show.length ? true : false;
+        }, "wait some miliseconds", 1 * 1000);
 
         runs(function () {
-            var hits_single_target = get_hit_counter();
-            debug("get less hits for authors: " + hits_all_targets + " > " + hits_single_target);
-            expect(hits_all_targets).toBeGreaterThan(hits_single_target);
+            debug("show record pop up");
+            expect($("div#mkwsRecords div.record:nth-child(3) div")).not.toBe(null);
         });
     });
 
-    it("show record author", function () {
-        show_record();
-    });
-});
-
-describe("Check status client counter", function () {
-    function get_time() {
-        var date = new Date();
-        return date.getTime();
-    }
-    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") {
-                return true;
-            } else {
-                return false;
-            }
-
-        }, "wait for status", 4 * 1000);
+    it("extract URL", function () {
+        var url = $("div#mkwsRecords div.record:nth-child(3) div table tbody tr td a").text();
+        debug("extracted URL from record: " + url);
 
+        expect(url).not.toBe(null);
+        expect(url).toMatch(/^http:\/\/[a-z0-9]+\.[0-9a-z].*\//i);
     });
-    runs(function () {
-        var clients = $("div#mkwsStat span.clients");
-        debug("span.clients: " + clients.text());
-        expect(clients.text()).toEqual("0/1");
-    });
-
 });
 
 describe("Check switch menu Records/Targets", function () {
@@ -228,7 +216,7 @@ describe("Check switch menu Records/Targets", function () {
 
         // now the target table must be visible
         expect($("div#mkwsBytarget").is(":visible")).toBe(true);
-        expect($("div#mkwsResults").is(":visible")).toBe(false);
+        expect($("div#mkwsRecords").is(":visible")).toBe(false);
 
         // wait a half second, to show the target view
         var time = (new Date).getTime();
@@ -248,10 +236,38 @@ describe("Check switch menu Records/Targets", function () {
 
         // now the target table must be visible
         expect($("div#mkwsBytarget").is(":visible")).toBe(false);
-        expect($("div#mkwsResults").is(":visible")).toBe(true);
+        expect($("div#mkwsRecords").is(":visible")).toBe(true);
     });
 });
 
+describe("Check status client counter", function () {
+    function get_time() {
+        var date = new Date();
+        return date.getTime();
+    }
+    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") {
+                return true;
+            } else {
+                return false;
+            }
+
+        }, "wait for status", 4 * 1000);
+
+    });
+    runs(function () {
+        var clients = $("div#mkwsStat span.clients");
+        debug("span.clients: " + clients.text());
+        expect(clients.text()).toEqual("0/1");
+    });
+
+});
+
 /* dummy EOF */
 describe("All tests are done", function () {
     it(">>> hooray <<<", function () {});