X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=733f7a4e8c316dc2933f7751beac590670a3242b;hp=92230ab4ff7872737591bed9533e7c7a1734490b;hb=756d64ef9e9b276ccf0028af414c7db96c76d14b;hpb=c685976dc9ce238e336690fbecc7d1d197b124e3 diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js index 92230ab..733f7a4 100644 --- a/test/spec/mkws-pazpar2.js +++ b/test/spec/mkws-pazpar2.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 IndexData ApS. http://indexdata.com +/* Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com * * perform papzpar2 / pz2.js search & retrieve request in the browser * @@ -6,7 +6,7 @@ // get references from mkws.js, lazy evaluation var debug = function (text) { - mkws.debug_function(text) + mkws.debug("Jasmine: " + text) } // Define empty mkws_config for simple applications that don't define it. @@ -48,9 +48,9 @@ function init_jasmine_config() { var get_hit_counter = function () { // not yet here - if ($("#mkwsPager").length == 0) return -1; + if ($(".mkwsPager").length == 0) return -1; - var found = $("#mkwsPager").text(); + var found = $(".mkwsPager").text(); var re = /\([A-Za-z]+:\s+([0-9]+)\)/; re.exec(found); var hits = -1; @@ -75,24 +75,45 @@ describe("Init jasmine config", function () { }); }); +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 + // 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 () { + expect($(".mkwsMOTD").length).toBe(1); + expect($("#testMOTD").length).toBe(1); + expect($("#testMOTD").text()).toMatch("^ *$"); + }); + + it("mkwsMOTDContainer has received the text", function () { + expect($(".mkwsMOTDContainer").length).toBe(1); + expect($(".mkwsMOTDContainer").text()).toMatch(/MOTD/); + }); + + +}); + describe("Check pazpar2 search", function () { - it("pazpar2 was successfully initialize", function () { + it("pazpar2 was successfully initialized", function () { expect(mkws_config.error).toBe(undefined); }); it("validate HTML id's", function () { - expect($("input#mkwsQuery").length).toBe(1); - expect($("input#mkwsButton").length).toBe(1); + expect($("input.mkwsQuery").length).toBe(1); + expect($("input.mkwsButton").length).toBe(1); - expect($("#mkwsNext").length).not.toBe(1); - expect($("#mkwsPrev").length).not.toBe(1); + expect($(".mkwsNext").length).not.toBe(1); + expect($(".mkwsPrev").length).not.toBe(1); }); it("run search query", function () { var search_query = jasmine_config.search_query; // short hit counter with some paging - $("input#mkwsQuery").val(search_query); + $("input.mkwsQuery").val(search_query); debug("set search query: " + search_query) - expect($("input#mkwsQuery").val()).toMatch("^" + search_query + "$"); + expect($("input.mkwsQuery").val()).toMatch("^" + search_query + "$"); if (mkws_config.use_service_proxy) { // wait for service proxy auth @@ -105,12 +126,24 @@ describe("Check pazpar2 search", function () { runs(function () { debug("Click on submit button"); - var click = $("input#mkwsButton").trigger("click"); + var click = $("input.mkwsButton").trigger("click"); expect(click.length).toBe(1); }) }); }); +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 @@ -120,7 +153,7 @@ describe("Check pazpar2 search", function () { describe("Check pazpar2 navigation", function () { // Asynchronous part it("check running search next/prev", function () { - expect($("#mkwsPager").length).toBe(1); + expect($(".mkwsPager").length).toBe(1); function my_click(id, time) { setTimeout(function () { @@ -133,22 +166,22 @@ describe("Check pazpar2 navigation", function () { } waitsFor(function () { - return $("div#mkwsPager div:nth-child(2) a").length >= 2 ? true : false; + return $("div.mkwsPager div:nth-child(2) a").length >= 2 ? true : false; }, "Expect next link 2", 10 * jasmine_config.second); runs(function () { // click next/prev after N seconds - my_click("#mkwsNext", 0); + my_click(".mkwsNext", 0); }); waitsFor(function () { - return $("div#mkwsPager div:nth-child(2) a").length >= 3 ? true : false; + return $("div.mkwsPager div:nth-child(2) a").length >= 3 ? true : false; }, "Expect next link 3", 5 * jasmine_config.second); runs(function () { // click next/prev after N seconds - my_click("#mkwsNext", 0); - my_click("#mkwsPrev", 0.2); + my_click(".mkwsNext", 0); + my_click(".mkwsPrev", 0.2); }); }); }); @@ -168,7 +201,7 @@ describe("Check pazpar2 hit counter", function () { runs(function () { debug("mkws pager found records: '" + hits + "'"); - expect($("#mkwsPager").length).toBe(1); + expect($(".mkwsPager").length).toBe(1); expect(hits).toBeGreaterThan(expected_hits); }); }); @@ -176,43 +209,48 @@ describe("Check pazpar2 hit counter", function () { describe("Check Termlist", function () { it("found Termlist", function () { - var termlist = $("div#mkwsTermlists"); + var termlist = $("div.mkwsTermlists"); debug("Termlist success: " + termlist.length); expect(termlist.length).toBe(1); waitsFor(function () { - return $("div#mkwsFacetSources").length == 1 ? true : false; + return $("div.mkwsFacetSources").length == 1 ? true : false; }, "check for facet sources", 4 * jasmine_config.second); // everything displayed? runs(function () { - var sources = $("div#mkwsFacetSources"); + var sources = $("div.mkwsFacetSources"); debug("Termlist sources success: " + sources.length); expect(sources.length).toBe(1); - var subjects = $("div#mkwsFacetSubjects"); + var subjects = $("div.mkwsFacetSubjects"); expect(subjects.length).toBe(1); - var authors = $("div#mkwsFacetAuthors"); + var authors = $("div.mkwsFacetAuthors"); expect(authors.length).toBe(1); }); waitsFor(function () { - return $("div#mkwsFacetAuthors div.term").length >= 2 ? true : false; + return $("div.mkwsFacetAuthors div.term").length >= 2 ? true : false; }, "At least one author link displayed", 4 * jasmine_config.second); runs(function () { - expect($("div#mkwsFacetAuthors div.term").length).toBeGreaterThan(1); + expect($("div.mkwsFacetAuthors div.term").length).toBeGreaterThan(1); }); }); it("limit search to first author", function () { + if (mkws_config.disable_facet_authors_search) { + debug("Facets: ignore limit search for authors"); + return; + } + var hits_all_targets = get_hit_counter(); 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" - var terms = $("div#mkwsFacetAuthors div.term a"); + var terms = $("div.mkwsFacetAuthors div.term a"); for (var i = 0; i < terms.length; i++) { var term = $(terms[i]).text(); if (term.match(/[0-9].+[0-9]/i) || !term.match(/,/)) { @@ -223,7 +261,7 @@ describe("Check Termlist", function () { } } - var click = $("div#mkwsFacetAuthors div.term:nth-child(" + author_number + ") a").trigger("click"); + var click = $("div.mkwsFacetAuthors div.term:nth-child(" + author_number + ") a").trigger("click"); debug("limit author click is success: " + click.length); expect(click.length).toBe(1); @@ -242,7 +280,7 @@ describe("Check Termlist", function () { var hits_all_targets = get_hit_counter(); var source_number = 2; // 2=first source // do not click on wikipedia link - no author or subject facets possible - var terms = $("div#mkwsFacetSources div.term a"); + var terms = $("div.mkwsFacetSources div.term a"); for (var i = 0; i < terms.length; i++) { var term = $(terms[i]).text(); if (term.match(/wikipedia/i)) { @@ -253,12 +291,12 @@ describe("Check Termlist", function () { } } - var click = $("div#mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click"); + 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: /)) { + if ($("div.mkwsNavi").length && $("div.mkwsNavi").text().match(/(Source|datenquelle|kilder): /i)) { return true; } else { return false; @@ -282,19 +320,19 @@ 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 + ") a").trigger("click"); + 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"); + var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") div"); return show != null && show.length ? true : false; }, "wait some miliseconds to show up a record", 2 * jasmine_config.second); runs(function () { debug("show record pop up"); - expect($("div#mkwsRecords div.record:nth-child(" + record_number + ") div")).not.toBe(null); + expect($("div.mkwsRecords div.record:nth-child(" + record_number + ") div")).not.toBe(null); }); }); @@ -331,7 +369,7 @@ describe("Check switch menu Records/Targets", function () { // now the target table must be visible expect($("div.mkwsBytarget").is(":visible")).toBe(true); - expect($("div#mkwsRecords").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(); @@ -351,8 +389,8 @@ describe("Check switch menu Records/Targets", function () { expect(click.length).toBe(1); // now the target table must be visible - expect($("div#mkwsBytarget").is(":visible")).toBe(false); - expect($("div#mkwsRecords").is(":visible")).toBe(true); + expect($("div.mkwsBytarget").is(":visible")).toBe(false); + expect($("div.mkwsRecords").is(":visible")).toBe(true); }); });