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

diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index 6e5d7bb..739b373 100644 (file)
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -50,7 +50,8 @@
     var jasmine_config = {
       search_query: "netbsd",
       expected_hits: 10,
-      active_clients: 17,
+      // active_clients: 17,
+      check_motd: false,
       show_record_url: true
     };
 
@@ -70,6 +71,5 @@ initially on "jsdemo" though now far removed from those beginnnings.
 [...]
     </pre>
 
-    <div id="testMOTD"><div class="mkwsMOTD">This is the mkwsMOTD div</div></div>
   </body>
 </html>

diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 8d1cc67..91e770c 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -41,6 +41,7 @@
     <script type="text/javascript">
     var mkws_config = {
       perpage_default: 10,
+      // active_clients: 17,
       pazpar2_url:          "//mkws.indexdata.com/service-proxy/",
       service_proxy_auth:   "//mkws.indexdata.com/service-proxy-testauth"
     };

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index de82dfe..3433115 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -36,6 +36,7 @@ function init_jasmine_config() {
         // miliseconds to seconds
         show_record_url: true,
         // check for valid URL in records
+        check_motd: true,
         dummy: false
     };
 
@@ -138,6 +139,10 @@ describe("Check pazpar2 search", function () {
 
 describe("Check MOTD after search", function () {
     it("MOTD is hidden", function () {
+        if (!jasmine_config.check_motd) {
+            return;
+        }
+
         expect($(".mkwsMOTD").length).toBe(1);
         expect($(".mkwsMOTD").is(":hidden")).toBe(true);
         debug("motd t=" + $(".mkwsMOTD").text());