From: Wolfram Schneider <wosch@indexdata.dk>
Date: Mon, 10 Feb 2014 17:41:07 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~1502
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=32c02dc6ca86cf29c6b24f4622635296d0981361;hp=-c;p=mkws-moved-to-github.git

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

32c02dc6ca86cf29c6b24f4622635296d0981361
diff --combined test/spec/mkws-pazpar2.js
index 42d3480,60483cd..7900190
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@@ -181,38 -181,33 +181,38 @@@ describe("Check Termlist", function () 
          expect(termlist.length).toBe(1);
  
          waitsFor(function () {
-             return $("div#mkwsFacetSources").length == 1 ? true : false;
+             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);
          });
      });
  
      it("limit search to first author", function () {
 +        if (mkws_config.disable_facet_authors_search) {
 +            debug("Facets: ignore limit search for authors");
 +            return;
 +        }
 +
          var hits_all_targets = get_hit_counter();
          var author_number = 2; // 2=first author
          // do not click on author with numbers, e.g.: "Bower, James M. Beeman, David, 1938-"
@@@ -228,7 -223,7 +228,7 @@@
              }
          }
  
-         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);
  
@@@ -258,7 -253,7 +258,7 @@@
              }
          }
  
-         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);