X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=0d1b201a231ee42c807532e8ecab0d47849d6a33;hb=fce9a8f7e3f3e929ef93d2cd1845b7b63a07e02f;hp=e7138bd974af0ec0d27ffb2d56bb76a39f834e52;hpb=de965039a6fd00affa2f30e696572d7d3a44ef5b;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index e7138bd..0d1b201 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -7,6 +7,7 @@
 var debug = mkws.debug;
 
 var get_hit_counter = function () {
+        // not yet here
         if ($("#mkwsPager").length == 0) return -1;
 
         var found = $("#mkwsPager").text();
@@ -29,11 +30,11 @@ describe("Check pazpar2 search", function () {
     });
 
     it("validate HTML id's", function () {
-        expect($("input#mkwsQuery").length == 1).toBe(true);
-        expect($("input#mkwsButton").length == 1).toBe(true);
+        expect($("input#mkwsQuery").length).toBe(1);
+        expect($("input#mkwsButton").length).toBe(1);
 
-        expect($("#mkwsNext").length == 1).toBe(false);
-        expect($("#mkwsPrev").length == 1).toBe(false);
+        expect($("#mkwsNext").length).not.toBe(1);
+        expect($("#mkwsPrev").length).not.toBe(1);
     });
 
     it("run search query", function () {
@@ -50,7 +51,7 @@ describe("Check pazpar2 search", function () {
         runs(function () {
             debug("Click on submit button");
             var click = $("input#mkwsButton").trigger("click");
-            expect(click.length == 1).toBe(true);
+            expect(click.length).toBe(1);
         })
     });
 });
@@ -59,7 +60,7 @@ describe("Check pazpar2 search", function () {
 describe("Check pazpar2 navigation", function () {
     // Asynchronous part
     it("check running search next/prev", function () {
-        expect($("#mkwsPager").length == 1).toBe(true);
+        expect($("#mkwsPager").length).toBe(1);
 
         function my_click(id, time) {
             setTimeout(function () {
@@ -67,13 +68,13 @@ describe("Check pazpar2 navigation", function () {
                 var click = $(id).trigger("click");
 
                 debug("next click is success: " + click.length);
-                expect(click.length == 1).toBe(true);
+                expect(click.length).toBe(1);
             }, time * 1000);
         }
 
         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
@@ -101,13 +102,13 @@ describe("Check pazpar2 hit counter", function () {
         waitsFor(function () {
             hits = get_hit_counter();
 
-            return hits >= expected_hits;
+            return hits > expected_hits;
         }, "Expect " + expected_hits + " hits", max_time * 1000);
 
 
         runs(function () {
             debug("mkws pager found records: '" + hits + "'");
-            expect($("#mkwsPager").length == 1).toBe(true);
+            expect($("#mkwsPager").length).toBe(1);
             expect(hits).toBeGreaterThan(expected_hits);
         });
     });
@@ -117,32 +118,32 @@ describe("Check Termlist", function () {
     it("found Termlist", function () {
         var termlist = $("div#mkwsTermlists");
         debug("Termlist success: " + termlist.length);
-        expect(termlist.length == 1).toBe(true);
+        expect(termlist.length).toBe(1);
 
-        var sources = $("div#mkwsFacetSources");
-        expect(sources.length == 1).toBe(true);
+        waitsFor(function () {
+            return $("div#mkwsFacetSources").length == 1 ? true : false;
+        }, "check for facet sources", 2 * 1000);
+
+        runs(function () {
+            var sources = $("div#mkwsFacetSources");
+            debug("Termlist sources success: " + sources.length);
+            expect(sources.length).toBe(1);
 
-        var subjects = $("div#mkwsFacetSubjects");
-        expect(subjects.length == 1).toBe(true);
+            var subjects = $("div#mkwsFacetSubjects");
+            expect(subjects.length).toBe(1);
+
+            var authors = $("div#mkwsFacetAuthors");
+            expect(authors.length).toBe(1);
+        });
 
-        var authors = $("div#mkwsFacetAuthors");
-        expect(authors.length == 1).toBe(true);
     });
 
-    it("limit search to first source", function () {
+    it("limit search to first author", function () {
         var hits_all_targets = get_hit_counter();
 
-        var click = $("div#mkwsFacetSources div.term:nth-child(2) a").trigger("click");
-        debug("limit source click is success: " + click.length);
-        expect(click.length == 1).toBe(true);
-
-        waitsFor(function () {
-            if ($("div#mkwsNavi").length && $("div#mkwsNavi").text().match(/^Source/)) {
-                return true;
-            } else {
-                return false;
-            }
-        }, "Search for source in navi bar", 1000);
+        var click = $("div#mkwsFacetAuthors div.term:nth-child(2) a").trigger("click");
+        debug("limit author click is success: " + click.length);
+        expect(click.length).toBe(1);
 
         waitsFor(function () {
             return get_hit_counter() < hits_all_targets ? true : false;
@@ -150,17 +151,31 @@ describe("Check Termlist", function () {
 
         runs(function () {
             var hits_single_target = get_hit_counter();
-            debug("get less hits for sources: " + hits_all_targets + " > " + hits_single_target);
+            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 author", function () {
+    it("limit search to first source", function () {
         var hits_all_targets = get_hit_counter();
+        var source_number = 2; // 2=first source
+        var source_name = $("div#mkwsFacetSources div.term:nth-child(" + source_number + ") a").text();
+        // do not click on wikipedia link - no author or subject facets possible
+        if (source_name.match(/wikipedia/i)) {
+            source_number++;
+        }
 
-        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);
+        var click = $("div#mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click");
+        debug("limit source click " + (source_number - 1) + " is success: " + click.length);
+        expect(click.length).toBe(1);
+
+        waitsFor(function () {
+            if ($("div#mkwsNavi").length && $("div#mkwsNavi").text().match(/^Source/)) {
+                return true;
+            } else {
+                return false;
+            }
+        }, "Search for source in navi bar", 1000);
 
         waitsFor(function () {
             return get_hit_counter() < hits_all_targets ? true : false;
@@ -168,32 +183,33 @@ describe("Check Termlist", function () {
 
         runs(function () {
             var hits_single_target = get_hit_counter();
-            debug("get less hits for authors: " + hits_all_targets + " > " + hits_single_target);
+            debug("get less hits for sources: " + hits_all_targets + " > " + hits_single_target);
             expect(hits_all_targets).toBeGreaterThan(hits_single_target);
         });
     });
 });
 
 describe("Show record", function () {
+    var record_number = 2; // the Nth record in hit list
     it("show record author", function () {
-        var click = $("div#mkwsRecords div.record:nth-child(3) :nth-child(2)").trigger("click");
+        var click = $("div#mkwsRecords div.record:nth-child(" + record_number + ") :nth-child(2)").trigger("click");
         debug("show click is success: " + click.length);
-        expect(click.length == 1).toBe(true);
+        expect(click.length).toBe(1);
 
         // wait until the record pops up
         waitsFor(function () {
-            var show = $("div#mkwsRecords div.record:nth-child(3) div");
+            var show = $("div#mkwsRecords div.record:nth-child(" + record_number + ") div");
             return show != null && show.length ? true : false;
-        }, "wait some miliseconds", 1 * 1000);
+        }, "wait some miliseconds", 2 * 1000);
 
         runs(function () {
             debug("show record pop up");
-            expect($("div#mkwsRecords div.record:nth-child(3) div")).not.toBe(null);
+            expect($("div#mkwsRecords div.record:nth-child(" + record_number + ") div")).not.toBe(null);
         });
     });
 
     it("extract URL", function () {
-        var url = $("div#mkwsRecords div.record:nth-child(3) div table tbody tr td a").text();
+        var url = $("div#mkwsRecords div.record:nth-child(" + record_number + ") div table tbody tr td a").text();
         debug("extracted URL from record: " + url);
 
         expect(url).not.toBe(null);
@@ -212,11 +228,11 @@ 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);
-        expect(click.length == 1).toBe(true);
+        expect(click.length).toBe(1);
 
         // 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();
@@ -232,11 +248,11 @@ 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);
-        expect(click.length == 1).toBe(true);
+        expect(click.length).toBe(1);
 
         // 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);
     });
 });