X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=b19b71e6f2f5b728a75ab1c7ff0b84be642dd026;hb=b3a8a8a4adfaa2c0b5b29228112709c94ff5e094;hp=877299668142433c9f0daa14b672a7aacf99e291;hpb=44c44c35b9e4b93404b380c10f5e0edbcfe3d4a7;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 8772996..b19b71e 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -6,10 +6,10 @@
 
 // get references from mkws.js, lazy evaluation
 var debug = function (text) {
-        mkws.debug("Jasmine: " + text)
+        mkws.log("Jasmine: " + text)
     }
 
-    // Define empty mkws_config for simple applications that don't define it.
+// Define empty jasmine_config for simple applications that don't define it.
 if (jasmine_config == null || typeof jasmine_config != 'object') {
     var jasmine_config = {};
 }
@@ -79,7 +79,7 @@ describe("Check MOTD before search", function () {
     // Check that the MOTD has been moved into its container, and
     // is visible before the search.
     // the mkwsMOTD div was originally inside a testMOTD div, which should
-    // now be emtpy
+    // now be empty
     // Note that the testMOTD is a regular div, and uses #testMOTD,
     // since the automagic class-making does not apply to it.
     it("MOTD is hidden", function () {
@@ -96,7 +96,7 @@ describe("Check MOTD before search", function () {
 
 describe("Check pazpar2 search", function () {
     it("pazpar2 was successfully initialized", function () {
-        expect(mkws_config.error).toBe(undefined);
+        expect(mkws.config.error).toBe(undefined);
     });
 
     it("validate HTML id's", function () {
@@ -113,7 +113,7 @@ describe("Check pazpar2 search", function () {
         debug("set search query: " + search_query)
         expect($("input.mkwsQuery").val()).toMatch("^" + search_query + "$");
 
-        if (mkws_config.use_service_proxy) {
+        if (mkws.config.use_service_proxy) {
             // wait for service proxy auth
             waitsFor(function () {
                 return mkws.authenticated;
@@ -203,33 +203,33 @@ describe("Check Termlist", function () {
         expect(termlist.length).toBe(1);
 
         waitsFor(function () {
-            return $("div.mkwsFacetSources").length == 1 ? true : false;
+            return $('div.mkwsFacet[data-mkws-facet="xtargets"]').length == 1 ? true : false;
         }, "check for facet sources", 4 * jasmine_config.second);
 
         // everything displayed?
         runs(function () {
-            var sources = $("div.mkwsFacetSources");
+            var sources = $('div.mkwsFacet[data-mkws-facet="xtargets"]');
             debug("Termlist sources success: " + sources.length);
             expect(sources.length).toBe(1);
 
-            var subjects = $("div.mkwsFacetSubjects");
+            var subjects = $('div.mkwsFacet[data-mkws-facet="subject"]');
             expect(subjects.length).toBe(1);
 
-            var authors = $("div.mkwsFacetAuthors");
+            var authors = $('div.mkwsFacet[data-mkws-facet="author"]');
             expect(authors.length).toBe(1);
         });
 
         waitsFor(function () {
-            return $("div.mkwsFacetAuthors div.term").length >= 2 ? true : false;
+            return $('div.mkwsFacet[data-mkws-facet="author"] 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.mkwsFacet[data-mkws-facet="author"] div.term').length).toBeGreaterThan(1);
         });
     });
 
     it("limit search to first author", function () {
-        if (mkws_config.disable_facet_authors_search) {
+        if (mkws.config.disable_facet_authors_search) {
             debug("Facets: ignore limit search for authors");
             return;
         }
@@ -322,30 +322,31 @@ describe("Check Termlist", function () {
 
 
 describe("Check record list", function () {
-    it("got a record", function () {
-        var linkaddr = "div.mkwsRecords div.record:nth-child(1) a";
-        var waitcount = 2;
+    it("check for single active client", function () {
+        waitsFor(function () {
+            var clients = $("div#mkwsStat span.clients");
+            //debug("clients: " + clients.text());
 
-        /*
-        // wait for new records, propertychange is for IE8
-        $("div.mkwsRecords").bind("DOMNodeInserted propertychange", function () {
-            waitcount++;
-            debug("DOM DOMNodeInserted:" + waitcount + " " + $("div.mkwsRecords div.record").length);
-        });
-        $("div.mkwsRecords").bind("DOMNodeRemoved", function () {
-            waitcount++;
-            debug("DOM DOMNodeRemoved:" + waitcount + " " + $("div.mkwsRecords div.record").length);
+            return clients.length == 1 && clients.text().match("/1$");
+        }, "wait for Active clients: x/1", 5 * jasmine_config.second);
+
+        runs(function () {
+            var clients = $("div#mkwsStat span.clients");
+            debug("span.clients: " + clients.text());
+            expect(clients.text()).toMatch("/1$");
         });
-        */
+    });
+
+    it("got a record", function () {
+        var linkaddr = "div.mkwsRecords div.record:nth-child(1) a";
 
         waitsFor(function () {
             // remove + insert node: must be at least 2
-            return waitcount >= 2 && $(linkaddr).length > 0;
-        }, "wait until we see a new record: " + waitcount, 2.2 * jasmine_config.second);
+            return $(linkaddr).length > 0;
+        }, "wait until we see a new record", 2.5 * jasmine_config.second);
 
         runs(function () {
-            expect(waitcount).toBeGreaterThan(0);
-            // $("div.mkwsRecords").unbind("DOMNodeInserted DOMNodeRemoved");
+            expect($(linkaddr).length).toBeGreaterThan(0);
         });
     });
 });
@@ -359,11 +360,11 @@ describe("Show record", function () {
 
         // wait until the record pops up
         waitsFor(function () {
-            var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") div");
-            debug($("div.mkwsRecords div.record").text());
+            var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") > div.details");
+            //debug("poprecord: " + (show ? show.length : -1) + " " + $("div.mkwsRecords div.record").text());
 
             return show != null && show.length ? true : false;
-        }, "wait some miliseconds to show up a record", 3 * jasmine_config.second);
+        }, "wait some miliseconds to show up a record", 2 * jasmine_config.second);
 
         runs(function () {
             debug("show record pop up");
@@ -437,19 +438,19 @@ describe("Check status client counter", function () {
     it("check status clients", function () {
         waitsFor(function () {
             var clients = $("div#mkwsStat span.clients");
+            debug("clients: " + clients.text());
             if (clients.length == 1 && clients.text().match("0/1$")) {
                 return true;
             } else {
                 return false;
             }
         }, "wait for Active clients: 0/1", 4 * jasmine_config.second);
-/*
+
         runs(function () {
             var clients = $("div#mkwsStat span.clients");
             debug("span.clients: " + clients.text());
-            expect(clients.text()).toEqual("0/1");
+            expect(clients.text()).toMatch("0/1$");
         });
-        */
     });
 });