X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=bf4af6ac5e3dcbbd97ecaf9c0a5c4ee4e0eed387;hb=2e4099249aa3b260eac15ba49a851dba828f665c;hp=e761a8868be70b3cd53823825fa973acc3c9517f;hpb=8f8ebece34ba09163a1823ed5dbb905685948653;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index e761a88..bf4af6a 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -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
     };
 
@@ -277,7 +284,7 @@ describe("Check Author Facets", function () {
 
         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);
 
@@ -530,6 +537,11 @@ 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").eq(0).trigger("click");
@@ -572,9 +584,14 @@ 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']");
             debug("per page default is: " + select.text() + " and unselect it");
@@ -586,13 +603,13 @@ describe("Check per page options", function () {
 
             $("div.mkwsRecords").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () {
                 waitcount++;
-                // debug("DOM wait for change, per page: " + waitcount);
+                debug("DOM wait for change, per page: " + waitcount);
             });
         });
 
         waitsFor(function () {
             //debug("wait for: " + waitcount);
-            return waitcount >= 6 ? true : false;
+            return waitcount >= 30 ? true : false;
         }, "Records DOM change, by per page", 3 * jasmine_config.second);
 
         runs(function () {
@@ -612,6 +629,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;