X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=test%2Fspec%2Fmkws-pazpar2.js;h=21ea770d7ce66e60cd295683034ed2ba33125442;hb=1d1d5564aff68d5607c5b4bcfc55fb8a5a7548ce;hp=08ea2e6ff45f9de4c76d068f4a711a1d5ec927d1;hpb=cd1388ebf3b69038d495f12e120bdfc02a2e7aa2;p=mkws-moved-to-github.git diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js index 08ea2e6..21ea770 100644 --- a/test/spec/mkws-pazpar2.js +++ b/test/spec/mkws-pazpar2.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com +/* Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com * * perform papzpar2 / pz2.js search & retrieve request in the browser * @@ -6,7 +6,10 @@ // get references from mkws.js, lazy evaluation var debug = function (text) { - mkws.log("Jasmine: " + text) + // use a debug function with time stamps + mkws.teams["AUTO"].log("Jasmine: " + text); + + //mkws.log("Jasmine: " + text) } // Define empty jasmine_config for simple applications that don't define it. @@ -37,6 +40,10 @@ function init_jasmine_config() { show_record_url: true, // check for valid URL in records check_motd: true, + + // check sort by and per page menu + check_sortby: false, + dummy: false }; @@ -49,28 +56,30 @@ function init_jasmine_config() { } mkws.jasmine_done = false; -} - -var get_hit_counter = function () { - // not yet here - if (mkws.$(".mkwsPager").length == 0) return -1; - - var found = mkws.$(".mkwsPager").text(); - var re = /\([A-Za-z]+:\s+([0-9]+)\)/; - re.exec(found); - var hits = -1; +}; - if (RegExp.$1) { - hits = parseInt(RegExp.$1); - if (hits <= 0) { - debug("Oooops in get_hit_counter: " + RegExp.$1 + " '" + found + "'"); - } +function get_hit_counter() { + var $ = mkws.$; + // not yet here + if ($(".mkws-pager").length == 0) return -1; + + var found = $(".mkws-pager").text(); + var re = /\([A-Za-z]+:\s+([0-9]+)\)/; + re.exec(found); + var hits = -1; + + if (RegExp.$1) { + hits = parseInt(RegExp.$1); + if (hits <= 0) { + debug("Oooops in get_hit_counter: " + RegExp.$1 + " '" + found + "'"); } - - //debug("Hits: " + hits); - return hits; } + //debug("Hits: " + hits); + return hits; +}; + +/******************************************************************************/ describe("Init jasmine config", function () { it("jasmine was successfully initialized", function () { init_jasmine_config(); @@ -84,42 +93,46 @@ describe("Init jasmine config", function () { //disabled xdescribe("Check MOTD before search", function () { + var $ = mkws.$; + // 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 + // the mkws-motd div was originally inside a testMOTD div, which should // 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 () { - expect(mkws.$(".mkwsMOTD").length).toBe(1); - expect(mkws.$("#testMOTD").length).toBe(1); - expect(mkws.$("#testMOTD").text()).toMatch("^ *$"); + expect($(".mkws-motd").length).toBe(1); + expect($("#testMOTD").length).toBe(1); + expect($("#testMOTD").text()).toMatch("^ *$"); }); - it("mkwsMOTDContainer has received the text", function () { - expect(mkws.$(".mkwsMOTDContainer").length).toBe(1); - expect(mkws.$(".mkwsMOTDContainer").text()).toMatch(/MOTD/); + it("mkws-motd-container has received the text", function () { + expect($(".mkws-motd-container").length).toBe(1); + expect($(".mkws-motd-container").text()).toMatch(/MOTD/); }); }); describe("Check pazpar2 search", function () { + var $ = mkws.$; + it("pazpar2 was successfully initialized", function () { expect(mkws.config.error).toBe(undefined); }); it("validate HTML id's", function () { - expect(mkws.$("input.mkwsQuery").length).toBe(1); - expect(mkws.$("input.mkwsButton").length).toBe(1); + expect($("input.mkws-query").length).toBe(1); + expect($("input.mkws-button").length).toBe(1); - expect(mkws.$(".mkwsNext").length).not.toBe(1); - expect(mkws.$(".mkwsPrev").length).not.toBe(1); + expect($(".mkws-next").length).not.toBe(1); + expect($(".mkws-prev").length).not.toBe(1); }); it("run search query", function () { var search_query = jasmine_config.search_query; // short hit counter with some paging - mkws.$("input.mkwsQuery").val(search_query); + $("input.mkws-query").val(search_query); debug("set search query: " + search_query) - expect(mkws.$("input.mkwsQuery").val()).toMatch("^" + search_query + "$"); + expect($("input.mkws-query").val()).toMatch("^" + search_query + "$"); if (mkws.config.use_service_proxy) { // wait for service proxy auth @@ -132,21 +145,23 @@ describe("Check pazpar2 search", function () { runs(function () { debug("Click on submit button"); - mkws.$("input.mkwsButton").trigger("click"); + $("input.mkws-button").trigger("click"); }) }); }); describe("Check MOTD after search", function () { + var $ = mkws.$; + it("MOTD is hidden", function () { if (!jasmine_config.check_motd) { return; } - expect(mkws.$(".mkwsMOTD").length).toBe(1); - expect(mkws.$(".mkwsMOTD").is(":hidden")).toBe(true); - debug("motd t=" + mkws.$(".mkwsMOTD").text()); - debug("motd v=" + mkws.$(".mkwsMOTD").is(":visible")); + expect($(".mkws-motd").length).toBe(1); + expect($(".mkws-motd").is(":hidden")).toBe(true); + debug("motd t=" + $(".mkws-motd").text()); + debug("motd v=" + $(".mkws-motd").is(":visible")); }); }); @@ -157,39 +172,43 @@ describe("Check MOTD after search", function () { * */ describe("Check pazpar2 navigation", function () { + var $ = mkws.$; + // Asynchronous part it("check running search next/prev", function () { - expect(mkws.$(".mkwsPager").length).toBe(1); + expect($(".mkws-pager").length).toBe(1); function my_click(id, time) { setTimeout(function () { debug("trigger click on id: " + id); - mkws.$(id).trigger("click"); + $(id).trigger("click"); }, time * jasmine_config.second); } waitsFor(function () { - return mkws.$("div.mkwsPager div:nth-child(2) a").length >= 2 ? true : false; + return $("div.mkws-pager 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(".mkws-next", 0); }); waitsFor(function () { - return mkws.$("div.mkwsPager div:nth-child(2) a").length >= 3 ? true : false; + return $("div.mkws-pager 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(".mkws-next", 0); + my_click(".mkws-prev", 0.2); }); }); }); describe("Check pazpar2 hit counter", function () { + var $ = mkws.$; + it("check running search hit counter", function () { var max_time = jasmine_config.max_time; // in seconds var expected_hits = jasmine_config.expected_hits; // at least expected hit counter @@ -202,41 +221,43 @@ describe("Check pazpar2 hit counter", function () { runs(function () { debug("mkws pager found records: '" + hits + "'"); - expect(mkws.$(".mkwsPager").length).toBe(1); + expect($(".mkws-pager").length).toBe(1); expect(hits).toBeGreaterThan(expected_hits); }); }); }); describe("Check Termlist", function () { + var $ = mkws.$; + it("found Termlist", function () { - var termlist = mkws.$("div.mkwsTermlists"); + var termlist = $("div.mkws-termlists"); debug("Termlist success: " + termlist.length); expect(termlist.length).toBe(1); waitsFor(function () { - return mkws.$("div.mkwsFacet[data-mkws-facet='xtargets']").length == 1 ? true : false; + return $("div.mkws-facet[data-mkws-facet='xtargets']").length == 1 ? true : false; }, "check for facet sources", 4 * jasmine_config.second); // everything displayed? runs(function () { - var sources = mkws.$("div.mkwsFacet[data-mkws-facet='xtargets']"); + var sources = $("div.mkws-facet[data-mkws-facet='xtargets']"); debug("Termlist sources success: " + sources.length); expect(sources.length).toBe(1); - var subjects = mkws.$("div.mkwsFacet[data-mkws-facet='subject']"); + var subjects = $("div.mkws-facet[data-mkws-facet='subject']"); expect(subjects.length).toBe(1); - var authors = mkws.$("div.mkwsFacet[data-mkws-facet='author']"); + var authors = $("div.mkws-facet[data-mkws-facet='author']"); expect(authors.length).toBe(1); }); waitsFor(function () { - return mkws.$("div.mkwsFacet[data-mkws-facet='author'] div.mkwsTerm").length >= 2 ? true : false; - }, "At least one author link displayed", 4 * jasmine_config.second); + return $("div.mkws-facet[data-mkws-facet='author'] div.mkws-term").length >= 2 ? true : false; + }, "At least two author link displayed", 4 * jasmine_config.second); runs(function () { - expect(mkws.$("div.mkwsFacet[data-mkws-facet='author'] div.mkwsTerm").length).toBeGreaterThan(1); + expect($("div.mkws-facet[data-mkws-facet='author'] div.mkws-term").length).toBeGreaterThan(1); }); }); }); @@ -244,6 +265,8 @@ describe("Check Termlist", function () { describe("Check Author Facets", function () { + var $ = mkws.$; + it("limit search to first author", function () { if (mkws.config.disable_facet_authors_search) { debug("Facets: ignore limit search for authors"); @@ -256,9 +279,9 @@ describe("Check Author Facets", function () { // do not click on author names without a comma, e.g.: "Joe Barbara" // because searching on such authors won't find anything. runs(function () { - var terms = mkws.$("div.mkwsFacet[data-mkws-facet='author'] div.mkwsTerm a"); + var terms = $("div.mkws-facet[data-mkws-facet='author'] div.mkws-term a"); for (var i = 0; i < terms.length; i++) { - var term = mkws.$(terms[i]).text(); + var term = $(terms[i]).text(); if (term.match(/[0-9].+[0-9]/i) || !term.match(/,/)) { debug("ignore author facet: " + term); author_number++; @@ -266,18 +289,18 @@ describe("Check Author Facets", function () { break; } } - if (mkws.$("div.mkwsFacet[data-mkws-facet='author'] div.mkwsTerm:nth-child(" + author_number + ") a").text().length == 0) { + if ($("div.mkws-facet[data-mkws-facet='author'] div.mkws-term:nth-child(" + author_number + ") a").text().length == 0) { debug("No good authors found. Not clicking on the bad ones"); return; } - debug("Clicking on author (" + author_number + ") " + mkws.$("div.mkwsFacet[data-mkws-facet='author'] div.mkwsTerm:nth-child(" + author_number + ") a").text()); - mkws.$("div.mkwsFacet[data-mkws-facet='author'] div.mkwsTerm:nth-child(" + author_number + ") a").trigger("click"); + debug("Clicking on author (" + author_number + ") " + $("div.mkws-facet[data-mkws-facet='author'] div.mkws-term:nth-child(" + author_number + ") a").text()); + $("div.mkws-facet[data-mkws-facet='author'] div.mkws-term:nth-child(" + author_number + ") a").trigger("click"); }); waitsFor(function () { var hits_single_target = get_hit_counter(); - console.log("hits_single_target='" + hits_single_target + "' cf. hits_all_targets='" + hits_all_targets + "'"); + // debug("hits_single_target='" + hits_single_target + "' cf. hits_all_targets='" + hits_all_targets + "'"); return hits_single_target > 0 && hits_single_target < hits_all_targets ? true : false; }, "Limited author search for less than " + hits_all_targets + " hits", 4.5 * jasmine_config.second); @@ -289,16 +312,18 @@ describe("Check Author Facets", function () { }); describe("Check active clients author", function () { + var $ = mkws.$; + it("check for active clients after limited author search", function () { waitsFor(function () { - var clients = mkws.$("div.mkwsStat span.mkwsClientCount"); + var clients = $("div.mkws-stat span.mkws-client-count"); // debug("clients: " + clients.text()); return clients.length == 1 && clients.text().match("/[1-9]+[0-9]*$"); }, "wait for Active clients: x/y", 5.5 * jasmine_config.second); runs(function () { - var clients = mkws.$("div.mkwsStat span.mkwsClientCount"); - debug("span.mkwsClientCount: " + clients.text()); + var clients = $("div.mkws-stat span.mkws-client-count"); + debug("span.mkws-client-count: " + clients.text()); expect(clients.text()).toMatch("/[1-9]+[0-9]*$"); // exact match of active clients (e.g. a SP misconfiguration) @@ -311,25 +336,27 @@ describe("Check active clients author", function () { }); describe("Check Source Facets", function () { + var $ = mkws.$; + it("limit search to first source", function () { var hits_all_targets = get_hit_counter(); var source_number = 2; // 2=first source // wait for a stat response var waitcount = 0; // do not click on wikipedia link - no author or subject facets possible - var link = "div.mkwsFacet[data-mkws-facet='xtargets'] div.mkwsTerm a"; + var link = "div.mkws-facet[data-mkws-facet='xtargets'] div.mkws-term a"; // wait for a visible source link in facets waitsFor(function () { - var terms = mkws.$(link); + var terms = $(link); return terms && terms.length > 0; }, "wait for source facets after author search", 5 * jasmine_config.second); runs(function () { - var terms = mkws.$(link); + var terms = $(link); for (var i = 0; i < terms.length; i++) { - var term = mkws.$(terms[i]).text(); + var term = $(terms[i]).text(); debug("check for good source: " + term); if (term.match(/wikipedia/i)) { @@ -341,22 +368,22 @@ describe("Check Source Facets", function () { } debug("Source counter: " + terms.length + ", select: " + (source_number - 1)); - if (mkws.$("div.mkwsFacet[data-mkws-facet='xtargets'] div.mkwsTerm:nth-child(" + source_number + ") a").text().length == 0) { + if ($("div.mkws-facet[data-mkws-facet='xtargets'] div.mkws-term:nth-child(" + source_number + ") a").text().length == 0) { debug("No good source found. Not clicking on the bad ones"); return; } debug("click on source link nth-child(): " + source_number); - mkws.$("div.mkwsFacet[data-mkws-facet='xtargets'] div.mkwsTerm:nth-child(" + source_number + ") a").trigger("click"); + $("div.mkws-facet[data-mkws-facet='xtargets'] div.mkws-term:nth-child(" + source_number + ") a").trigger("click"); - mkws.$(".mkwsPager").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () { + $(".mkws-pager").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () { waitcount++; - debug("DOM wait for stat: " + waitcount); + debug("DOM change mkws-pager, for stat: " + waitcount); }); }); waitsFor(function () { - if (mkws.$("div.mkwsNavi").length && mkws.$("div.mkwsNavi").text().match(/(Source|datenquelle|kilder): /i)) { + if ($("div.mkws-navi").length && $("div.mkws-navi").text().match(/(Source|datenquelle|kilder): /i)) { return true; } else { return false; @@ -377,13 +404,15 @@ describe("Check Source Facets", function () { expect(hits_all_targets).not.toBeLessThan(hits_single_target); jasmine_status.source_click = 1; - mkws.$(".mkwsPager").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); + $(".mkws-pager").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); }); }); }); describe("Check record list", function () { + var $ = mkws.$; + it("check for single active client", function () { if (!jasmine_status.source_click) { debug("skip clients check due missing source click"); @@ -391,49 +420,51 @@ describe("Check record list", function () { } waitsFor(function () { - var clients = mkws.$("div.mkwsStat span.mkwsClientCount"); + var clients = $("div.mkws-stat span.mkws-client-count"); //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 = mkws.$("div.mkwsStat span.mkwsClientCount"); - debug("span.mkwsClientCount: " + clients.text()); + var clients = $("div.mkws-stat span.mkws-client-count"); + debug("span.mkws-client-count: " + clients.text()); expect(clients.text()).toMatch("/1$"); }); }); it("got a record", function () { - var linkaddr = "div.mkwsRecords div.mkwsSummary:nth-child(1) a"; + var linkaddr = "div.mkws-records div.mkws-summary:nth-child(1) a"; waitsFor(function () { // remove + insert node: must be at least 2 - return mkws.$(linkaddr).length > 0; + return $(linkaddr).length > 0; }, "wait until we see a new record", 2.5 * jasmine_config.second); runs(function () { - expect(mkws.$(linkaddr).length).toBeGreaterThan(0); + expect($(linkaddr).length).toBeGreaterThan(0); }); }); }); describe("Show record", function () { + var $ = mkws.$; + var record_number = 1; // the Nth record in hit list it("show record author", function () { - var click = mkws.$("div.mkwsRecords div.mkwsSummary:nth-child(" + record_number + ") a").trigger("click"); + var click = $("div.mkws-records div.mkws-summary: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 = mkws.$("div.mkwsRecords div.mkwsSummary:nth-child(" + record_number + ") > div.mkwsDetails"); - //debug("poprecord: " + (show ? show.length : -1) + " " + mkws.$("div.mkwsRecords div.mkwsSummary").text()); + var show = $("div.mkws-records div.mkws-summary:nth-child(" + record_number + ") > div.mkws-details"); + //debug("poprecord: " + (show ? show.length : -1) + " " + $("div.mkws-records div.mkws-summary").text()); 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(mkws.$("div.mkwsRecords div.mkwsSummary:nth-child(" + record_number + ") div")).not.toBe(null); + expect($("div.mkws-records div.mkws-summary:nth-child(" + record_number + ") div")).not.toBe(null); }); }); @@ -443,11 +474,11 @@ describe("Show record", function () { return; } - var urls = mkws.$("div.mkwsRecords div.mkwsSummary:nth-child(" + record_number + ") div table tbody tr td a"); + var urls = $("div.mkws-records div.mkws-summary:nth-child(" + record_number + ") div table tbody tr td a"); debug("number of extracted URL from record: " + urls.length); // expect(urls.length).toBeGreaterThan(0); // LoC has records without links for (var i = 0; i < urls.length; i++) { - var url = mkws.$(urls[i]); + var url = $(urls[i]); debug("URL: " + url.attr('href') + " text: " + url.text()); expect(url.attr('href')).not.toBe(null); @@ -458,19 +489,21 @@ describe("Show record", function () { }); describe("Check switch menu Records/Targets", function () { - it("check mkwsSwitch", function () { - expect(mkws.$("div.mkwsSwitch").length).toBe(1); + var $ = mkws.$; + + it("check mkws-switch", function () { + expect($("div.mkws-switch").length).toBe(1); // expect 2 clickable links - expect(mkws.$("div.mkwsSwitch > a").length).toBe(2); + expect($("div.mkws-switch > a").length).toBe(2); }); it("switch to target view", function () { - mkws.$("div.mkwsSwitch > a").eq(1).trigger("click"); + $("div.mkws-switch > a").eq(1).trigger("click"); // now the target table must be visible - expect(mkws.$("div.mkwsTargets").is(":visible")).toBe(true); - expect(mkws.$("div.mkwsRecords").is(":visible")).toBe(false); + expect($("div.mkws-targets").is(":visible")).toBe(true); + expect($("div.mkws-records").is(":visible")).toBe(false); // wait a half second, to show the target view var time = (new Date).getTime(); @@ -480,20 +513,22 @@ describe("Check switch menu Records/Targets", function () { // look for table header runs(function () { - expect(mkws.$("div.mkwsTargets").html()).toMatch(/Target ID/); + expect($("div.mkws-targets").html()).toMatch(/Target ID/); }); }); it("switch back to record view", function () { - mkws.$("div.mkwsSwitch > a").eq(0).trigger("click"); + $("div.mkws-switch > a").eq(0).trigger("click"); // now the target table must be visible - expect(mkws.$("div.mkwsTargets").is(":visible")).toBe(false); - expect(mkws.$("div.mkwsRecords").is(":visible")).toBe(true); + expect($("div.mkws-targets").is(":visible")).toBe(false); + expect($("div.mkws-records").is(":visible")).toBe(true); }); }); describe("Check status client counter", function () { + var $ = mkws.$; + function get_time() { var date = new Date(); return date.getTime(); @@ -507,7 +542,7 @@ describe("Check status client counter", function () { } waitsFor(function () { - var clients = mkws.$("div.mkwsStat span.mkwsClientCount"); + var clients = $("div.mkws-stat span.mkws-client-count"); debug("clients: " + clients.text()); if (clients.length == 1 && clients.text().match("0/1$")) { return true; @@ -517,8 +552,8 @@ describe("Check status client counter", function () { }, "wait for Active clients: 0/1", 4 * jasmine_config.second); runs(function () { - var clients = mkws.$("div.mkwsStat span.mkwsClientCount"); - debug("span.mkwsClientCount: " + clients.text()); + var clients = $("div.mkws-stat span.mkws-client-count"); + debug("span.mkws-client-count: " + clients.text()); expect(clients.text()).toMatch("0/1$"); }); }); @@ -530,29 +565,51 @@ describe("Check removable facets links", function () { it("remove links for source and author", function () { var waitcount = 0; + if (!jasmine_config.check_sortby) { + debug("ignore check for removable facets"); + return; + } + runs(function () { - var click = $("a.mkwsRemovable").trigger("click"); - debug("Removed facets links: " + click.length); - expect(click.length).toBe(2); + var click = $("a.mkws-removable").eq(0).trigger("click"); + debug("Removed first facets link: " + click.length); + expect(click.length).toBe(1); }); runs(function () { - $(".mkwsPager").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () { + $("div.mkws-records").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () { waitcount++; - debug("DOM change for removeable: " + waitcount); + debug("DOM change mkws-records for removeable: " + waitcount); }); }); waitsFor(function () { - // debug("wait for: " + waitcount); - return waitcount >= 2 ? true : false; - }, "Records DOM change, by per page", 2 * jasmine_config.second); - + return waitcount >= 2 && $("a.mkws-removable").length == 1 ? 1 : 0; + }, "Records DOM change mkws-records, removable", 2 * jasmine_config.second); runs(function () { debug("unbind removable"); - $(".mkwsPager").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); + $("div.mkws-records").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); + waitcount = 0; + + $("div.mkws-records").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () { + waitcount++; + debug("DOM change mkws-records for removeable2: " + waitcount); + }); + + var click = $("a.mkws-removable").eq(0).trigger("click"); + debug("Removed second facets link: " + click.length); + expect(click.length).toBe(1); + }); + + waitsFor(function () { + return waitcount >= 2 && $("a.mkws-removable").length == 0 ? true : false; + }, "DOM change mkws-records, removable2", 2 * jasmine_config.second); + + runs(function () { + debug("unbind removable2"); + $("div.mkws-records").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); }); }); }); @@ -562,37 +619,40 @@ describe("Check per page options", function () { var $ = mkws.$; it("show per page", function () { + if (!jasmine_config.check_sortby) { + debug("ignore check for per page select"); + return; + } var waitcount = 0; var per_page_number = 20; + runs(function () { - var select = $("select.mkwsPerpage option[selected='selected']"); + var select = $("select.mkws-perpage option[selected='selected']"); debug("per page default is: " + select.text() + " and unselect it"); select.removeAttr('selected'); - select = $("select.mkwsPerpage option[value='" + per_page_number + "']").attr('selected', true); + select = $("select.mkws-perpage option[value='" + per_page_number + "']").attr('selected', true); debug("per page is set to: " + select.text()); select.trigger("change"); - $("div.mkwsRecords").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () { + $("div.mkws-records").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () { waitcount++; - // debug("DOM wait for change, per page: " + waitcount); + debug("DOM change mkws-records, per page: " + waitcount); }); }); waitsFor(function () { - debug("wait for: " + waitcount); - return waitcount >= 6 ? true : false; - }, "Records DOM change, by per page", 3 * jasmine_config.second); + // debug("per page waitcounter: " + waitcount) + return waitcount >= (per_page_number + 10) ? true : false; + }, "DOM change mkws-records, by per page", 3 * jasmine_config.second); runs(function () { - $("div.mkwsRecords").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); debug("unbind per page"); - }); + $("div.mkws-records").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); - runs(function () { - var records = $("div.mkwsRecords > div.mkwsSummary"); - debug("Got now " + records.length + " records"); + var records = $("div.mkws-records > div.mkws-summary"); + debug("Per page got now " + records.length + " records"); expect(records.length).toBe(per_page_number); }); }); @@ -602,6 +662,11 @@ describe("Check SortBy options", function () { var $ = mkws.$; it("show per page", function () { + if (!jasmine_config.check_sortby) { + debug("ignore check for sort by"); + return; + } + var waitcount = 0; var sort_value = 'title:1'; var per_page_number = 20; @@ -609,9 +674,9 @@ describe("Check SortBy options", function () { function title_list(prefix) { var list = []; - var terms = $("div.mkwsRecords > div.mkwsSummary > a"); + var terms = $("div.mkws-records > div.mkws-summary > a"); for (var i = 0; i < terms.length; i++) { - var term = $(terms[i]).text(); + var term = $(terms[i]).text().trim(); list.push(term); // debug(prefix + "title: " + term); } @@ -619,33 +684,31 @@ describe("Check SortBy options", function () { } runs(function () { - $("div.mkwsRecords").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () { + $("div.mkws-records").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () { waitcount++; - //debug("DOM wait for change, sort by: " + waitcount); + debug("DOM change mkws-records, sort by: " + waitcount); }); - var select = $("select.mkwsSort option[selected='selected']"); + var select = $("select.mkws-sort option[selected='selected']"); debug("Sort by default is: " + select.text() + " and unselect it"); select.removeAttr('selected'); - select = $("select.mkwsSort option[value='" + sort_value + "']").attr('selected', true); - debug("srot by is set to: " + select.text()); + select = $("select.mkws-sort option[value='" + sort_value + "']").attr('selected', true); + debug("sort by is set to: " + select.text()); select.trigger("change"); }); waitsFor(function () { - debug("wait for2: " + waitcount); - return waitcount >= 6 ? true : false; - }, "Records DOM change, by sort page", 3 * jasmine_config.second); + //debug("wait for2: " + waitcount); + return waitcount >= (per_page_number + 10) ? true : false; + }, "DOM change mkws-records, by sort page", 3 * jasmine_config.second); runs(function () { - $("div.mkwsRecords").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); - debug("unbind per page"); - }); + $("div.mkws-records").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); + debug("unbind by sort"); - runs(function () { - var records = $("div.mkwsRecords > div.mkwsSummary a"); - debug("Got now " + records.length + " records"); + var records = $("div.mkws-records > div.mkws-summary"); + debug("Sort by got now " + records.length + " records"); expect(records.length).toBe(per_page_number); }); @@ -653,7 +716,7 @@ describe("Check SortBy options", function () { var title_list_new = title_list("yyy "); var diff_flag = 0; for (var i = 0; i < title_list_old.length; i++) { - debug(title_list_old[i] + " :: " + title_list_new[i]); + debug((i+1) + ". " + title_list_old[i] + " :: " + title_list_new[i]); if (title_list_old[i] != title_list_new[i]) { diff_flag++; @@ -665,10 +728,29 @@ describe("Check SortBy options", function () { }); }); +describe("Check async widget discovery", function () { + var $ = mkws.$; + it("initialises a new widget", function() { + $("div.mkws-search").after('