X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=898ae06c2a02c8e1f974d2b26cadd2bdc8ba0bdc;hb=7bcd054bbf692e5eafe62fa72b1fa8fef7c92c51;hp=8f51dce901daa1e170317a0381527a5e2582a035;hpb=e4d23a0734328dbd993ca78fea30fec4c61eb184;p=mkws-moved-to-github.git diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js index 8f51dce..898ae06 100644 --- a/test/spec/mkws-pazpar2.js +++ b/test/spec/mkws-pazpar2.js @@ -4,26 +4,29 @@ * */ -var debug = mkws.debug; +// get references from mkws.js, lazy evaluation +var debug = function () { mkws.debug_level; } +var debug_level = function () { mkws.debug_function } var get_hit_counter = function () { - // not yet here - if ($("#mkwsPager").length == 0) return -1; - - var found = $("#mkwsPager").text(); - var re = /\([A-Za-z]+:\s+([0-9]+)\)/; - re.exec(found); - var hits = -1; - - if (RegExp.$1) { - hits = parseInt(RegExp.$1); - expect(hits).toBeGreaterThan(0); - } - - //debug("Hits: " + hits); - return hits; + // not yet here + if ($("#mkwsPager").length == 0) + return -1; + + var found = $("#mkwsPager").text(); + var re = /\([A-Za-z]+:\s+([0-9]+)\)/; + re.exec(found); + var hits = -1; + + if (RegExp.$1) { + hits = parseInt(RegExp.$1); + expect(hits).toBeGreaterThan(0); } + //debug("Hits: " + hits); + return hits; +} + describe("Check pazpar2 search", function () { it("pazpar2 was successfully initialize", function () { expect(mkws_config.error).toBe(undefined); @@ -45,7 +48,7 @@ describe("Check pazpar2 search", function () { // wait for service proxy auth waitsFor(function () { - return mkws.service_proxy_auth; + return mkws.authenticated; }, "SP auth done", 10 * 1000); runs(function () { @@ -57,6 +60,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 +75,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 +132,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 +146,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 +164,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 +187,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 +196,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(); @@ -192,8 +209,8 @@ describe("Check Termlist", function () { describe("Show record", function () { 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 @@ -227,7 +244,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 @@ -248,7 +265,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 @@ -267,19 +284,21 @@ describe("Check status client counter", function () { 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"); }); + */ });