less debugging

[mkws-moved-to-github.git] / test / spec / mkws-pazpar2.js

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 7e051e3..176ccda 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -462,11 +462,11 @@ describe("Check switch menu Records/Targets", function () {
         expect(mkws.$("div.mkwsSwitch").length).toBe(1);
 
         // expect 2 clickable links
-        expect(mkws.$("div.mkwsSwitch a").length).toBe(2);
+        expect(mkws.$("div.mkwsSwitch > a").length).toBe(2);
     });
 
     it("switch to target view", function () {
-        mkws.$("div.mkwsSwitch").children('a').eq(1).trigger("click");
+        mkws.$("div.mkwsSwitch > a").eq(1).trigger("click");
 
         // now the target table must be visible
         expect(mkws.$("div.mkwsTargets").is(":visible")).toBe(true);
@@ -485,7 +485,7 @@ describe("Check switch menu Records/Targets", function () {
     });
 
     it("switch back to record view", function () {
-        mkws.$("div.mkwsSwitch").children('a').eq(0).trigger("click");
+        mkws.$("div.mkwsSwitch > a").eq(0).trigger("click");
 
         // now the target table must be visible
         expect(mkws.$("div.mkwsTargets").is(":visible")).toBe(false);
@@ -532,9 +532,9 @@ describe("Check removable facets links", function () {
         var waitcount = 0;
 
         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 +545,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);
@@ -576,7 +586,7 @@ 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);
             });
         });
 
@@ -621,7 +631,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']");
@@ -631,12 +641,10 @@ describe("Check SortBy options", function () {
             select = $("select.mkwsSort option[value='" + sort_value + "']").attr('selected', true);
             debug("srot 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);