X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=0a800c38e8ae1fa2c092a0825f97690742088a8c;hb=6ae7335448ecf8799b474a2f1e623ecfa850bec9;hp=0d1b201a231ee42c807532e8ecab0d47849d6a33;hpb=fce9a8f7e3f3e929ef93d2cd1845b7b63a07e02f;p=mkws-moved-to-github.git diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js index 0d1b201..0a800c3 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 () { @@ -147,7 +168,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(); @@ -170,7 +191,7 @@ 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; @@ -179,7 +200,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(); @@ -190,17 +211,17 @@ 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); + 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 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"); @@ -227,7 +248,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 @@ -239,6 +260,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/); @@ -247,7 +269,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 @@ -264,22 +286,24 @@ 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") { + 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"); + }); + */ - }); - runs(function () { - var clients = $("div#mkwsStat span.clients"); - debug("span.clients: " + clients.text()); - expect(clients.text()).toEqual("0/1"); }); });