Check switch menu Records/Targets

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 2e3e46c..9a5746f 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -7,21 +7,21 @@
 var debug = mkws.debug;
 
 var get_hit_counter = function () {
-    if ($("#mkwsPager").length == 0) return -1;
+        if ($("#mkwsPager").length == 0) return -1;
 
-    var found = $("#mkwsPager").text();
-    var re = /\([A-Za-z]+:\s+([0-9]+)\)/;
-    re.exec(found);
-    var hits = -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);
-        expect(hits).toBeGreaterThan(0);
-    }
+        if (RegExp.$1) {
+            hits = parseInt(RegExp.$1);
+            expect(hits).toBeGreaterThan(0);
+        }
 
-    //debug("Hits: " + hits);
-    return hits;
-}
+        //debug("Hits: " + hits);
+        return hits;
+    }
 
 describe("Check pazpar2 search", function () {
     it("pazpar2 was successfully initialize", function () {
@@ -37,21 +37,20 @@ describe("Check pazpar2 search", function () {
     });
 
     it("run search query", function () {
-       var search_query = "freebsd"; // short hit counter with some paging
-
+        var search_query = "freebsd"; // short hit counter with some paging
         $("input#mkwsQuery").val(search_query);
-       debug("set search query: " + search_query)
+        debug("set search query: " + search_query)
         expect($("input#mkwsQuery").val()).toMatch("^" + search_query + "$");
 
-       // wait for service proxy auth
-       waitsFor(function () {
+        // wait for service proxy auth
+        waitsFor(function () {
             return mkws.service_proxy_auth;
         }, "SP auth done", 10 * 1000);
 
         runs(function () {
-           debug("Click on submit button");
+            debug("Click on submit button");
             var click = $("input#mkwsButton").trigger("click");
-           expect(click.length == 1).toBe(true);
+            expect(click.length == 1).toBe(true);
         })
     });
 });
@@ -73,23 +72,23 @@ describe("Check pazpar2 navigation", function () {
         }
 
         waitsFor(function () {
-           return $("div#mkwsPager div:nth-child(2) a").length >= 2 ? true : false;
+            return $("div#mkwsPager div:nth-child(2) a").length >= 2 ? true : false;
         }, "Expect next link 2", 5 * 1000);
 
         runs(function () {
             // click next/prev after N seconds
             my_click("#mkwsNext", 0);
-       });
+        });
 
         waitsFor(function () {
-           return $("div#mkwsPager div:nth-child(2) a").length >= 3 ? true : false;
+            return $("div#mkwsPager div:nth-child(2) a").length >= 3 ? true : false;
         }, "Expect next link 3", 5 * 1000);
 
         runs(function () {
             // click next/prev after N seconds
             my_click("#mkwsNext", 0);
             my_click("#mkwsPrev", 0.2);
-       });
+        });
     });
 });
 
@@ -97,18 +96,17 @@ describe("Check pazpar2 hit counter", function () {
     it("check running search hit counter", function () {
         var max_time = 10; // in seconds
         var expected_hits = 116; // at least expected hit counter
-
         var hits = 0;
 
         waitsFor(function () {
-           hits = get_hit_counter();
+            hits = get_hit_counter();
 
             return hits >= expected_hits;
         }, "Expect N hits in x seconds", max_time * 1000);
 
 
         runs(function () {
-           debug("mkws pager found records: '" + hits + "'");
+            debug("mkws pager found records: '" + hits + "'");
             expect($("#mkwsPager").length == 1).toBe(true);
             expect(hits).toBeGreaterThan(expected_hits);
         });
@@ -215,53 +213,46 @@ describe("Check status client counter", function () {
 
 });
 
-//describe("Check switch menu Records/Targets", function () {
-//    var div = $("div#mkwsSwitch");
-////    if (div.length == 0) {
-////   debug("mkwsSwitch does not exists, skip test");
-////   return;
-////    }
-//
-//
-//    it("check mkwsSwitch", function () {
-//     expect($("div#mkwsSwitch").length).toBe(1);
-//
-//     // expect 2 clickable links
-//     expect( $("div#mkwsSwitch a").length).toBe(2);
-//    });
-//
-//    it("switch to target view", function () {
-//     var click = $("a#mkwsSwitch_targets").trigger("click");
-//     debug("target click is success: " + click.length);
-//     expect(click.length == 1).toBe(true);
-//
-//     // now the target table must be visible
-//     /*
-//     expect($("div#mkwsBytarget").is(":visible")).toBe(true);
-//     */
-//     expect($("div#mkwsResults").is(":visible")).toBe(true);
-//
-//     // look for table header
-//     expect($("div#mkwsBytarget").html()).toMatch(/Target ID/);
-//    });
-//
-//    /*
-//    it("switch back to record view", function () {
-//     var click = $("div#mkwsSwitch a:nth-child(0)").trigger("click");
-//     debug("record click is success: " + click.length);
-//     expect(click.length == 1).toBe(true);
-//
-//     // now the target table must be in-visible again
-//     var bytarget = $("div#mkwsBytarget:visible");
-//     var byrecords = $("div#mkwsResults:visible");
-//     expect(bytarget.length == 1).toBe(false);
-//     expect(byrecords.length == 1).toBe(true);
-//    });
-//    */
-//});
+describe("Check switch menu Records/Targets", function () {
+    it("check mkwsSwitch", function () {
+        expect($("div#mkwsSwitch").length).toBe(1);
+
+        // expect 2 clickable links
+        expect($("div#mkwsSwitch a").length).toBe(2);
+    });
+
+    it("switch to target view", function () {
+        var click = $("a#mkwsSwitch_targets").trigger("click");
+        debug("target click is success: " + click.length);
+        expect(click.length == 1).toBe(true);
+
+        // now the target table must be visible
+        expect($("div#mkwsBytarget").is(":visible")).toBe(true);
+        expect($("div#mkwsResults").is(":visible")).toBe(false);
+
+        // wait a half second, to show the target view
+        var time = (new Date).getTime();
+        waitsFor(function () {
+            return (new Date).getTime() - time > 700 ? true : false;
+        }, "wait some miliseconds", 1 * 1000);
+        // look for table header
+        runs(function () {
+            expect($("div#mkwsBytarget").html()).toMatch(/Target ID/);
+        });
+    });
+
+    it("switch back to record view", function () {
+        var click = $("a#mkwsSwitch_records").trigger("click");
+        debug("record click is success: " + click.length);
+        expect(click.length == 1).toBe(true);
+
+        // now the target table must be visible
+        expect($("div#mkwsBytarget").is(":visible")).toBe(false);
+        expect($("div#mkwsResults").is(":visible")).toBe(true);
+    });
+});
 
 /* dummy EOF */
 describe("All tests are done", function () {
-    it("xxx >>> hooray!!! <<<", function () {
-    });
+    it(">>> hooray <<<", function () {});
 });

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index fc4528f..0414414 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -691,15 +691,9 @@ function mkws_set_lang(mkws_config)  {
 function mkws_html_switch(config) {
     debug("HTML switch");
 
-    $("#mkwsSwitch").html($("<a/>", {
-       href: "javascript:mkws.switchView('records')",
-       text: M("Records")
-    }));
+    $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_records" onclick="mkws.switchView(\'records\')">' + M("Records") + '</a>'));
     $("#mkwsSwitch").append($("<span/>", { text: " | " }));
-    $("#mkwsSwitch").append($("<a/>", {
-       href: "javascript:mkws.switchView('targets')",
-       text: M("Targets")
-    }));
+    $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_targets" onclick="mkws.switchView(\'targets\')">' + M("Targets") + '</a>'));
 
     debug("HTML targets");
     $("#mkwsTargets").html('\