Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws

diff --git a/examples/htdocs/wolfram.html b/examples/htdocs/wolfram.html
index 83a67a6..34438c1 100644 (file)
--- a/examples/htdocs/wolfram.html
+++ b/examples/htdocs/wolfram.html
@@ -56,7 +56,7 @@
     <!-- <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js"></script> -->
     <script type="text/javascript">
       // check for the real jQuery / $ object
-      console.log("Reset jQuery and $ objection to null....");
+      mkws.log("Reset jQuery and $ objection to null....");
       $ = null;
       jQuery = null;
     </script>

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 274e45f..211b61c 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -254,7 +254,7 @@ describe("Check Termlist", function () {
 
         waitsFor(function () {
             return $("div.mkwsFacet[data-mkws-facet='author'] div.mkwsTerm").length >= 2 ? true : false;
-        }, "At least one author link displayed", 4 * jasmine_config.second);
+        }, "At least two author link displayed", 4 * jasmine_config.second);
 
         runs(function () {
             expect($("div.mkwsFacet[data-mkws-facet='author'] div.mkwsTerm").length).toBeGreaterThan(1);

diff --git a/test/widgets/url.mike b/test/widgets/url.mike
index b865087..8c8fc40 100644 (file)
--- a/test/widgets/url.mike
+++ b/test/widgets/url.mike
@@ -1,2 +1 @@
 http://zthes.z3950.org/
-http://sagp.miketaylor.org.uk/