X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=2dab391abc300d6d4ca9c2ece32ad360651dec84;hb=72107f57026d4a677d328b000fad3b89b3c17351;hp=cb5ba41f3089e9d13fd9db8b358f5511c4020fe3;hpb=30d4c34eebe574801b03fb88293c74728d9aaf82;p=mkws-moved-to-github.git diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js index cb5ba41..2dab391 100644 --- a/test/spec/mkws-pazpar2.js +++ b/test/spec/mkws-pazpar2.js @@ -6,10 +6,10 @@ // get references from mkws.js, lazy evaluation var debug = function (text) { - mkws.debug("Jasmine: " + text) + mkws.log("Jasmine: " + text) } - // Define empty mkws_config for simple applications that don't define it. +// Define empty jasmine_config for simple applications that don't define it. if (jasmine_config == null || typeof jasmine_config != 'object') { var jasmine_config = {}; } @@ -79,7 +79,7 @@ describe("Check MOTD before search", function () { // Check that the MOTD has been moved into its container, and // is visible before the search. // the mkwsMOTD div was originally inside a testMOTD div, which should - // now be emtpy + // now be empty // Note that the testMOTD is a regular div, and uses #testMOTD, // since the automagic class-making does not apply to it. it("MOTD is hidden", function () { @@ -92,13 +92,11 @@ describe("Check MOTD before search", function () { expect($(".mkwsMOTDContainer").length).toBe(1); expect($(".mkwsMOTDContainer").text()).toMatch(/MOTD/); }); - - }); describe("Check pazpar2 search", function () { it("pazpar2 was successfully initialized", function () { - expect(mkws_config.error).toBe(undefined); + expect(mkws.config.error).toBe(undefined); }); it("validate HTML id's", function () { @@ -115,7 +113,7 @@ describe("Check pazpar2 search", function () { debug("set search query: " + search_query) expect($("input.mkwsQuery").val()).toMatch("^" + search_query + "$"); - if (mkws_config.use_service_proxy) { + if (mkws.config.use_service_proxy) { // wait for service proxy auth waitsFor(function () { return mkws.authenticated; @@ -135,15 +133,12 @@ describe("Check MOTD after search", function () { it("MOTD is hidden", function () { expect($(".mkwsMOTD").length).toBe(1); expect($(".mkwsMOTD").is(":hidden")).toBe(true); - //debug("motd " + $(".mkwsMOTD")); debug("motd t=" + $(".mkwsMOTD").text()); debug("motd v=" + $(".mkwsMOTD").is(":visible")); - //expect($("div.mkwsBytarget").is(":visible")).toBe(true); }); }); - /* * This part runs in background. It should be rewritten with * async jasmine functions @@ -190,11 +185,9 @@ describe("Check pazpar2 hit counter", function () { waitsFor(function () { hits = get_hit_counter(); - return hits > expected_hits; }, "Expect " + expected_hits + " hits", max_time * jasmine_config.second); - runs(function () { debug("mkws pager found records: '" + hits + "'"); expect($(".mkwsPager").length).toBe(1); @@ -213,7 +206,6 @@ describe("Check Termlist", function () { return $("div.mkwsFacetSources").length == 1 ? true : false; }, "check for facet sources", 4 * jasmine_config.second); - // everything displayed? runs(function () { var sources = $("div.mkwsFacetSources"); @@ -237,7 +229,7 @@ describe("Check Termlist", function () { }); it("limit search to first author", function () { - if (mkws_config.disable_facet_authors_search) { + if (mkws.config.disable_facet_authors_search) { debug("Facets: ignore limit search for authors"); return; } @@ -246,6 +238,7 @@ describe("Check Termlist", function () { var author_number = 2; // 2=first author // do not click on author with numbers, e.g.: "Bower, James M. Beeman, David, 1938-" // do not click on author names without a comma, e.g.: "Joe Barbara" + // because searching on such authors won't find anything. var terms = $("div.mkwsFacetAuthors div.term a"); for (var i = 0; i < terms.length; i++) { var term = $(terms[i]).text(); @@ -296,6 +289,13 @@ describe("Check Termlist", function () { $("div.mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click"); + // wait for a stat response + var waitcount = 0; + $(".mkwsPager").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () { + waitcount++; + debug("DOM wait for stat: " + waitcount); + }); + waitsFor(function () { if ($("div.mkwsNavi").length && $("div.mkwsNavi").text().match(/(Source|datenquelle|kilder): /i)) { return true; @@ -307,39 +307,50 @@ describe("Check Termlist", function () { // 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; + return waitcount >= 2 && get_hit_counter() <= hits_all_targets ? true : false; }, "Limited source search for less than " + hits_all_targets + " hits", 5 * jasmine_config.second); runs(function () { var hits_single_target = get_hit_counter(); debug("get less hits for sources: " + hits_all_targets + " > " + hits_single_target); expect(hits_all_targets).not.toBeLessThan(hits_single_target); + + $(".mkwsPager").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); }); }); }); + describe("Check record list", function () { + it("check for single active client", function () { + waitsFor(function () { + var clients = $("div#mkwsStat span.clients"); + //debug("clients: " + clients.text()); + + return clients.length == 1 && clients.text().match("/1$"); + }, "wait for Active clients: x/1", 5 * jasmine_config.second); + + runs(function () { + var clients = $("div#mkwsStat span.clients"); + debug("span.clients: " + clients.text()); + expect(clients.text()).toMatch("/1$"); + }); + }); + it("got a record", function () { - // make sure we have a link. var linkaddr = "div.mkwsRecords div.record:nth-child(1) a"; - var waitcount = 0; waitsFor(function () { - waitcount++; - debug("waiting for the link " + waitcount + " " + $(linkaddr) + " =" + $(linkaddr).length + " " + $(linkaddr).text()); - return ($(linkaddr).length > 0); - }, "wait until we see a link", 1 * jasmine_config.second); + // remove + insert node: must be at least 2 + return $(linkaddr).length > 0; + }, "wait until we see a new record", 2.5 * jasmine_config.second); runs(function () { - var link = $(linkaddr); - debug("== waited (" + waitcount + ") for the link..." + $(linkaddr) + " =" + $(linkaddr).length + " " + $(linkaddr).text()); - expect(link.length).toBe(1); - // link.trigger("click"); + expect($(linkaddr).length).toBeGreaterThan(0); }); }); }); - describe("Show record", function () { var record_number = 1; // the Nth record in hit list it("show record author", function () { @@ -349,7 +360,9 @@ describe("Show record", function () { // wait until the record pops up waitsFor(function () { - var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") div"); + var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") > div.details"); + //debug("poprecord: " + (show ? show.length : -1) + " " + $("div.mkwsRecords div.record").text()); + return show != null && show.length ? true : false; }, "wait some miliseconds to show up a record", 2 * jasmine_config.second); @@ -373,7 +386,7 @@ describe("Show record", function () { debug("URL: " + url.attr('href') + " text: " + url.text()); expect(url.attr('href')).not.toBe(null); - expect(url.attr('href')).toMatch(/^https?:\/\/[a-z0-9]+\.[0-9a-z].*\//i); + expect(url.attr('href')).toMatch(/^https?:\/\/[a-z0-9\-]+\.[0-9a-z].*\//i); expect(url.text()).not.toBe(""); } }); @@ -425,24 +438,20 @@ describe("Check status client counter", function () { it("check status clients", function () { waitsFor(function () { var clients = $("div#mkwsStat span.clients"); + debug("clients: " + clients.text()); if (clients.length == 1 && clients.text().match("0/1$")) { return true; } else { return false; } - }, "wait for Active clients: 0/1", 4 * jasmine_config.second); -/* runs(function () { var clients = $("div#mkwsStat span.clients"); debug("span.clients: " + clients.text()); - expect(clients.text()).toEqual("0/1"); + expect(clients.text()).toMatch("0/1$"); }); - */ - }); - }); /* done */