X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=7d94fdeff3456a1c34e6b43b88bc06c35cc97263;hb=4f1ab9ef2368bc67a0964b349de30fd1d425bb5c;hp=e52e0f83365f707b85e86ab7ec65d7c46dae56c1;hpb=696ae3cddda1f4747effe93992a1aac757a7b7d5;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index e52e0f8..7d94fde 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -42,6 +42,8 @@ function init_jasmine_config() {
         }
         debug("jasmine config: " + key + " => " + jasmine_config[key]);
     }
+
+    mkws.jasmine_done = false;
 }
 
 var get_hit_counter = function () {
@@ -180,7 +182,7 @@ describe("Check Termlist", function () {
 
         waitsFor(function () {
             return $("div#mkwsFacetSources").length == 1 ? true : false;
-        }, "check for facet sources", 2 * jasmine_config.second);
+        }, "check for facet sources", 4 * jasmine_config.second);
 
 
         // everything displayed?
@@ -212,7 +214,7 @@ describe("Check Termlist", function () {
         // do not click on author names without a comma, e.g.: "Joe Barbara"
         var terms = $("div#mkwsFacetAuthors div.term a");
         for (var i = 0; i < terms.length; i++) {
-            var term = terms[i].text;
+            var term = $(terms[i]).text();
             if (term.match(/[0-9].+[0-9]/i) || !term.match(/,/)) {
                 debug("ignore author facet: " + term);
                 author_number++;
@@ -242,8 +244,9 @@ describe("Check Termlist", function () {
         // do not click on wikipedia link - no author or subject facets possible
         var terms = $("div#mkwsFacetSources div.term a");
         for (var i = 0; i < terms.length; i++) {
-            if (terms[i].text.match(/wikipedia/i)) {
-                debug("ignore source facet: " + terms[i].text);
+            var term = $(terms[i]).text();
+            if (term.match(/wikipedia/i)) {
+                debug("ignore source facet: " + term);
                 source_number++;
             } else {
                 break;
@@ -260,7 +263,7 @@ describe("Check Termlist", function () {
             } else {
                 return false;
             }
-        }, "Search for source in navi bar", jasmine_config.second);
+        }, "Search for source in navi bar", 4 * jasmine_config.second);
 
         // Note: it may happens that limited source search returns the same number of hits
         // as before. Thats not really an error, but unfortunate
@@ -279,7 +282,7 @@ describe("Check Termlist", function () {
 describe("Show record", function () {
     var record_number = 1; // the Nth record in hit list
     it("show record author", function () {
-        var click = $("div#mkwsRecords div.record:nth-child(" + record_number + ") a").trigger("click");
+        var click = $("div.mkwsRecords div.record:nth-child(" + record_number + ") a").trigger("click");
         debug("show record click is success: " + click.length);
         expect(click.length).toBe(1);
 
@@ -304,29 +307,30 @@ describe("Show record", function () {
         var urls = $("div#mkwsRecords div.record:nth-child(" + record_number + ") div table tbody tr td a");
         debug("number of extracted URL from record: " + urls.length);
         for (var i = 0; i < urls.length; i++) {
-            debug("URL: " + urls[i].href);
-            expect(urls[i].href).not.toBe(null);
-            expect(urls[i].href).toMatch(/^https?:\/\/[a-z0-9]+\.[0-9a-z].*\//i);
-            expect(urls[i].href).toBe(urls[i].text);
+            var url = $(urls[i]);
+            debug("URL: " + url.attr('href'));
+            expect(url.attr('href')).not.toBe(null);
+            expect(url.attr('href')).toMatch(/^https?:\/\/[a-z0-9]+\.[0-9a-z].*\//i);
+            expect(url.attr('href')).toBe(url.text());
         }
     });
 });
 
 describe("Check switch menu Records/Targets", function () {
     it("check mkwsSwitch", function () {
-        expect($("div#mkwsSwitch").length).toBe(1);
+        expect($("div.mkwsSwitch").length).toBe(1);
 
         // expect 2 clickable links
-        expect($("div#mkwsSwitch a").length).toBe(2);
+        expect($("div.mkwsSwitch a").length).toBe(2);
     });
 
     it("switch to target view", function () {
-        var click = $("a#mkwsSwitch_targets").trigger("click");
+        var click = $("div.mkwsSwitch").children('a').eq(1).trigger("click");
         debug("target view click is success: " + click.length);
         expect(click.length).toBe(1);
 
         // now the target table must be visible
-        expect($("div#mkwsBytarget").is(":visible")).toBe(true);
+        expect($("div.mkwsBytarget").is(":visible")).toBe(true);
         expect($("div#mkwsRecords").is(":visible")).toBe(false);
 
         // wait a half second, to show the target view
@@ -337,12 +341,12 @@ describe("Check switch menu Records/Targets", function () {
 
         // look for table header
         runs(function () {
-            expect($("div#mkwsBytarget").html()).toMatch(/Target ID/);
+            expect($("div.mkwsBytarget").html()).toMatch(/Target ID/);
         });
     });
 
     it("switch back to record view", function () {
-        var click = $("a#mkwsSwitch_records").trigger("click");
+        var click = $("div.mkwsSwitch").children('a').eq(0).trigger("click");
         debug("record view click is success: " + click.length);
         expect(click.length).toBe(1);
 
@@ -382,7 +386,9 @@ describe("Check status client counter", function () {
 
 });
 
-/* dummy EOF */
+/* done */
 describe("All tests are done", function () {
-    it(">>> hooray <<<", function () {});
+    it(">>> hooray <<<", function () {
+        mkws.jasmine_done = true;
+    });
 });