X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=96380a72fc4729b73048f95a703c65f813a8515f;hp=db095731d95480a09f40d046453f0640fe537db3;hb=252fc09560a82fcbadbb8ad7d2dc7176d773f359;hpb=537f4dc8cc689815a84105a6278dc79256ffab59

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index db09573..96380a7 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -37,6 +37,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 +281,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,11 +534,16 @@ 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.mkwsRemovable").eq(0).trigger("click");
+            debug("Removed first facets link: " + click.length);
+            expect(click.length).toBe(1);
         });
 
         runs(function () {
@@ -545,6 +554,16 @@ describe("Check removable facets links", function () {
         });
 
         waitsFor(function () {
+            return $("a.mkwsRemovable").length == 1 ? 1 : 0;
+        });
+
+        runs(function () {
+            var click = $("a.mkwsRemovable").eq(0).trigger("click");
+            debug("Removed second facets link: " + click.length);
+            expect(click.length).toBe(1);
+        });
+
+        waitsFor(function () {
             // debug("wait for: " + waitcount);
             return waitcount >= 2 ? true : false;
         }, "Records DOM change, by per page", 2 * jasmine_config.second);
@@ -562,9 +581,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");
@@ -576,12 +600,12 @@ 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);
+            //debug("wait for: " + waitcount);
             return waitcount >= 6 ? true : false;
         }, "Records DOM change, by per page", 3 * jasmine_config.second);
 
@@ -602,6 +626,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;
@@ -621,7 +650,7 @@ describe("Check SortBy options", function () {
         runs(function () {
             $("div.mkwsRecords").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () {
                 waitcount++;
-                debug("DOM wait for change, per page: " + waitcount);
+                //debug("DOM wait for change, sort by: " + waitcount);
             });
 
             var select = $("select.mkwsSort option[selected='selected']");
@@ -629,14 +658,12 @@ describe("Check SortBy options", function () {
             select.removeAttr('selected');
 
             select = $("select.mkwsSort option[value='" + sort_value + "']").attr('selected', true);
-            debug("srot by is set to: " + select.text());
+            debug("sort by is set to: " + select.text());
             select.trigger("change");
-
-
         });
 
         waitsFor(function () {
-            debug("wait for2: " + waitcount);
+            //debug("wait for2: " + waitcount);
             return waitcount >= 6 ? true : false;
         }, "Records DOM change, by sort page", 3 * jasmine_config.second);