X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=fe0e3458b91ed49dba06121842b74e21d9e38bdc;hb=a1857b32353c865b611eec9ee98ac532ff83dd3d;hp=34b2804816c5569a2442707b3f354c071852c6d4;hpb=dc3e44937524489d7bc97cbbe291e861dfc0a63c;p=mkws-moved-to-github.git diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js index 34b2804..fe0e345 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 * @@ -56,28 +56,30 @@ function init_jasmine_config() { } mkws.jasmine_done = false; -} - -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); - if (hits <= 0) { - debug("Oooops in get_hit_counter: " + RegExp.$1 + " '" + found + "'"); - } +function get_hit_counter() { + var $ = mkws.$; + // 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); + 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(); @@ -91,6 +93,8 @@ 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 @@ -639,18 +643,16 @@ describe("Check per page options", function () { }); waitsFor(function () { - //debug("wait for: " + waitcount); - return waitcount >= (per_page_number * 2) ? true : false; + // debug("per page waitcounter: " + waitcount) + return waitcount >= (per_page_number + 10) ? true : false; }, "DOM change mkwsRecords, by per page", 3 * jasmine_config.second); runs(function () { - $("div.mkwsRecords").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); debug("unbind per page"); - }); + $("div.mkwsRecords").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); - runs(function () { var records = $("div.mkwsRecords > div.mkwsSummary"); - debug("Got now " + records.length + " records"); + debug("Per page got now " + records.length + " records"); expect(records.length).toBe(per_page_number); }); }); @@ -674,7 +676,7 @@ describe("Check SortBy options", function () { var list = []; var terms = $("div.mkwsRecords > div.mkwsSummary > 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); } @@ -698,17 +700,15 @@ describe("Check SortBy options", function () { waitsFor(function () { //debug("wait for2: " + waitcount); - return waitcount >= per_page_number ? true : false; + return waitcount >= (per_page_number + 10) ? true : false; }, "DOM change mkwsRecords, by sort page", 3 * jasmine_config.second); runs(function () { $("div.mkwsRecords").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); - debug("unbind per page"); - }); + debug("unbind by sort"); - runs(function () { - var records = $("div.mkwsRecords > div.mkwsSummary a"); - debug("Got now " + records.length + " records"); + var records = $("div.mkwsRecords > div.mkwsSummary > a"); + debug("Sort by got now " + records.length + " records"); expect(records.length).toBe(per_page_number); }); @@ -728,10 +728,29 @@ describe("Check SortBy options", function () { }); }); +describe("Check async widget discovery", function () { + var $ = mkws.$; + it("initialises a new widget", function() { + $("div.mkwsSearch").after('