From: Wolfram Schneider <wosch@indexdata.dk>
Date: Mon, 10 Mar 2014 14:32:53 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~1318^2~10
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=12edf367d96791fbcac972c8e1993fc69f0c16ad;hp=-c;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
---

12edf367d96791fbcac972c8e1993fc69f0c16ad
diff --combined test/spec/mkws-pazpar2.js
index 9503683,fe1e746..9981ccc
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@@ -92,8 -92,6 +92,6 @@@ describe("Check MOTD before search", fu
          expect($(".mkwsMOTDContainer").length).toBe(1);
          expect($(".mkwsMOTDContainer").text()).toMatch(/MOTD/);
      });
- 
- 
  });
  
  describe("Check pazpar2 search", function () {
@@@ -135,15 -133,12 +133,12 @@@ describe("Check MOTD after search", fun
      it("MOTD is hidden", function () {
          expect($(".mkwsMOTD").length).toBe(1);
          expect($(".mkwsMOTD").is(":hidden")).toBe(true);
-         //debug("motd " + $(".mkwsMOTD"));
          debug("motd t=" + $(".mkwsMOTD").text());
          debug("motd v=" + $(".mkwsMOTD").is(":visible"));
-         //expect($("div.mkwsBytarget").is(":visible")).toBe(true);
      });
  });
  
  
- 
  /*
   * This part runs in background. It should be rewritten with
   * async jasmine functions
@@@ -190,11 -185,9 +185,9 @@@ describe("Check pazpar2 hit counter", f
  
          waitsFor(function () {
              hits = get_hit_counter();
              return hits > expected_hits;
          }, "Expect " + expected_hits + " hits", max_time * jasmine_config.second);
  
- 
          runs(function () {
              debug("mkws pager found records: '" + hits + "'");
              expect($(".mkwsPager").length).toBe(1);
@@@ -213,7 -206,6 +206,6 @@@ describe("Check Termlist", function () 
              return $("div.mkwsFacetSources").length == 1 ? true : false;
          }, "check for facet sources", 4 * jasmine_config.second);
  
- 
          // everything displayed?
          runs(function () {
              var sources = $("div.mkwsFacetSources");
@@@ -246,6 -238,7 +238,7 @@@
          var author_number = 2; // 2=first author
          // do not click on author with numbers, e.g.: "Bower, James M. Beeman, David, 1938-"
          // do not click on author names without a comma, e.g.: "Joe Barbara"
+         // because searching on such authors won't find anything.
          var terms = $("div.mkwsFacetAuthors div.term a");
          for (var i = 0; i < terms.length; i++) {
              var term = $(terms[i]).text();
@@@ -318,30 -311,27 +311,29 @@@
      });
  });
  
 +
  describe("Check record list", function () {
      it("got a record", function () {
          var linkaddr = "div.mkwsRecords div.record:nth-child(1) a";
          var waitcount = 0;
  
 -        waitsFor(function () {
 +        // wait for new records
 +        $("div.mkwsRecords").bind("DOMSubtreeModified", function () {
              waitcount++;
 -            debug("waiting for the link " + waitcount + " " + $(linkaddr) + " =" + $(linkaddr).length + " " + $(linkaddr).text());
 -            return ($(linkaddr).length > 0);
 -        }, "wait until we see a link", 1 * jasmine_config.second);
 +            debug("DOM div.mkwsRecords changed");
 +        });
 +
 +        waitsFor(function () {
 +            return waitcount > 0 && $(linkaddr).length > 0;
 +        }, "wait until we see a new record", 2.2 * jasmine_config.second);
  
          runs(function () {
 -            var link = $(linkaddr);
 -            debug("== waited (" + waitcount + ") for the link..." + $(linkaddr) + " =" + $(linkaddr).length + " " + $(linkaddr).text());
 -            expect(link.length).toBe(1);
 -            // link.trigger("click");
 +            expect(waitcount).toBeGreaterThan(0);
 +            $("div.mkwsRecords").unbind("DOMSubtreeModified");
          });
      });
  });
  
- 
  describe("Show record", function () {
      var record_number = 1; // the Nth record in hit list
      it("show record author", function () {
@@@ -432,9 -422,7 +424,7 @@@ describe("Check status client counter"
              } else {
                  return false;
              }
- 
          }, "wait for Active clients: 0/1", 4 * jasmine_config.second);
- 
  /*
          runs(function () {
              var clients = $("div#mkwsStat span.clients");
@@@ -442,9 -430,7 +432,7 @@@
              expect(clients.text()).toEqual("0/1");
          });
          */
- 
      });
- 
  });
  
  /* done */