X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=60483cd2899f3789185d6a501e51864c3f35eb8b;hb=17f6e251e4cceb61561611ebbf3c2f34ac3142d7;hp=657b5dd8af2f8edd35c73195409f6f666ae1bcab;hpb=b5c1d1eb4a29e9fba366ac253c02f27e6f6d8142;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 657b5dd..60483cd 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013 IndexData ApS. http://indexdata.com
+/* Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
  *
  * perform papzpar2 / pz2.js search & retrieve request in the browser
  *
@@ -42,6 +42,8 @@ function init_jasmine_config() {
         }
         debug("jasmine config: " + key + " => " + jasmine_config[key]);
     }
+
+    mkws.jasmine_done = false;
 }
 
 var get_hit_counter = function () {
@@ -74,7 +76,7 @@ describe("Init jasmine config", function () {
 });
 
 describe("Check pazpar2 search", function () {
-    it("pazpar2 was successfully initialize", function () {
+    it("pazpar2 was successfully initialized", function () {
         expect(mkws_config.error).toBe(undefined);
     });
 
@@ -179,29 +181,29 @@ describe("Check Termlist", function () {
         expect(termlist.length).toBe(1);
 
         waitsFor(function () {
-            return $("div#mkwsFacetSources").length == 1 ? true : false;
-        }, "check for facet sources", 2 * jasmine_config.second);
+            return $("div.mkwsFacetSources").length == 1 ? true : false;
+        }, "check for facet sources", 4 * jasmine_config.second);
 
 
         // everything displayed?
         runs(function () {
-            var sources = $("div#mkwsFacetSources");
+            var sources = $("div.mkwsFacetSources");
             debug("Termlist sources success: " + sources.length);
             expect(sources.length).toBe(1);
 
-            var subjects = $("div#mkwsFacetSubjects");
+            var subjects = $("div.mkwsFacetSubjects");
             expect(subjects.length).toBe(1);
 
-            var authors = $("div#mkwsFacetAuthors");
+            var authors = $("div.mkwsFacetAuthors");
             expect(authors.length).toBe(1);
         });
 
         waitsFor(function () {
-            return $("div#mkwsFacetAuthors div.term").length >= 2 ? true : false;
+            return $("div.mkwsFacetAuthors div.term").length >= 2 ? true : false;
         }, "At least one author link displayed", 4 * jasmine_config.second);
 
         runs(function () {
-            expect($("div#mkwsFacetAuthors div.term").length).toBeGreaterThan(1);
+            expect($("div.mkwsFacetAuthors div.term").length).toBeGreaterThan(1);
         });
     });
 
@@ -221,7 +223,7 @@ describe("Check Termlist", function () {
             }
         }
 
-        var click = $("div#mkwsFacetAuthors div.term:nth-child(" + author_number + ") a").trigger("click");
+        var click = $("div.mkwsFacetAuthors div.term:nth-child(" + author_number + ") a").trigger("click");
         debug("limit author click is success: " + click.length);
         expect(click.length).toBe(1);
 
@@ -239,7 +241,6 @@ describe("Check Termlist", function () {
     it("limit search to first source", function () {
         var hits_all_targets = get_hit_counter();
         var source_number = 2; // 2=first source
-
         // 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++) {
@@ -252,17 +253,17 @@ describe("Check Termlist", function () {
             }
         }
 
-        var click = $("div#mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click");
+        var click = $("div.mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click");
         debug("limit source click " + (source_number - 1) + " is success: " + click.length);
         expect(click.length).toBe(1);
 
         waitsFor(function () {
-            if ($("div#mkwsNavi").length && $("div#mkwsNavi").text().match(/Source: /)) {
+            if ($("div#mkwsNavi").length && $("div#mkwsNavi").text().match(/(Source|datenquelle|kilder): /i)) {
                 return true;
             } 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
@@ -281,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);
 
@@ -306,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
@@ -339,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);
 
@@ -384,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;
+    });
 });