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

diff --git a/README b/README
index 3b99f61..6e16913 100644 (file)
--- a/README
+++ b/README
@@ -5,11 +5,6 @@ The MasterKey Widget Set, or MKWS, is a project to create some very
 simple HTML/JS/CSS widgets that can be dropped into ANY website,
 irrespective of CMS or lack thereof, to enable MasterKey searching.
 
-The top level bug for discussing this is
-        https://jira.indexdata.com/browse/MKWS-1
-and a high-level description can be found at
-        https://twiki.indexdata.com/twiki/bin/view/ID/MasterKeyWidgetSet
-
 
 WHAT'S WHAT
 ===========
@@ -24,5 +19,11 @@ notes -- internal documents, not for customers
 Required devel tools
 ====================
 
-on debian, you will need: curl git-core pandoc
+on debian, you will need: 
+$ sudo apt-get install curl git-core pandoc yui-compressor
+
+NEWS
+=========
+
+see tools/htdocs/NEWS
 

diff --git a/examples/apache2/mkws-examples b/examples/apache2/mkws-examples
index 460e154..472071b 100644 (file)
--- a/examples/apache2/mkws-examples
+++ b/examples/apache2/mkws-examples
@@ -7,7 +7,7 @@
     CustomLog /var/log/apache2/mkws-examples-access.log combined
 
     RewriteEngine on
-    RewriteRule /service-proxy-auth/ http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=demo&password=demo [P]
+    RewriteRule /service-proxy-auth http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=mkws&password=mkws [P]
     #RewriteLog /var/log/apache2/mkws-examples-rewrite.log
     #RewriteLogLevel 9
 </VirtualHost>

diff --git a/examples/htdocs/README b/examples/htdocs/README
new file mode 100644 (file)
index 0000000..702151d
--- /dev/null
+++ b/examples/htdocs/README
@@ -0,0 +1,15 @@
+Development
+===========================================
+
+please run first in this directory: 
+$ make jasmine-links
+
+
+jasmine.html      - jasmine test with standard HTML page. 
+
+jasmine-popup.html - jasmine test with MKWS popup. No HTML, only JavaScript.
+                    Returns better readable test results as jasmine.html, 
+                    but it is less flexible.
+
+
+

diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 7ab701e..6ca6304 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -6,23 +6,23 @@
     <link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
     <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
 
-    <script type="text/javascript" src="../../tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/mkws.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
 
-    <link rel="shortcut icon" type="image/png" href="../jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
-    <link rel="stylesheet" type="text/css" href="../jasmine/lib/jasmine-1.3.1/jasmine.css">
-    <script type="text/javascript" src="../jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
-    <script type="text/javascript" src="../jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
+    <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
+    <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-1.3.1/jasmine.css">
+    <script type="text/javascript" src="jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
+    <script type="text/javascript" src="jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
 
-    <script type="text/javascript" src="../../test/spec/true.spec.js"></script>
-    <script type="text/javascript" src="../../test/spec/mkws-config.js"></script>
-    <script type="text/javascript" src="../../test/spec/mkws-pazpar2.js"></script>
+    <script type="text/javascript" src="test/spec/true.spec.js"></script>
+    <script type="text/javascript" src="test/spec/mkws-config.js"></script>
+    <script type="text/javascript" src="test/spec/mkws-pazpar2.js"></script>
 
-    <script type="text/javascript" src="../../test/js/mkws-jasmine-run.js"></script>
+    <script type="text/javascript" src="test/js/mkws-jasmine-run.js"></script>
     <script type="text/javascript"> mkws_jasmine_init(500); </script>
   </head>
 

diff --git a/examples/htdocs/jasmine-pp2.html b/examples/htdocs/jasmine-pp2.html
index 6dabeb2..3357021 100644 (file)
--- a/examples/htdocs/jasmine-pp2.html
+++ b/examples/htdocs/jasmine-pp2.html
@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo jasmine test framework</title>
-    <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
          jasmine: { "show_record_url": false },
@@ -12,10 +12,10 @@
       };
     </script>
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/mkws.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
     <style type="text/css">
       #mkwsTermlists div.facet {
       float:left;
@@ -28,18 +28,18 @@
     </style>
 
   <!-- SECTION jasmine -->
-    <link rel="shortcut icon" type="image/png" href="../jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
-    <link rel="stylesheet" type="text/css" href="../jasmine/lib/jasmine-1.3.1/jasmine.css">
-    <script type="text/javascript" src="../jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
-    <script type="text/javascript" src="../jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
+    <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
+    <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-1.3.1/jasmine.css">
+    <script type="text/javascript" src="jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
+    <script type="text/javascript" src="jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
 
     <!-- include MKWS spec files ... -->
-    <script type="text/javascript" src="../../test/spec/true.spec.js"></script>
-    <script type="text/javascript" src="../../test/spec/mkws-config.js"></script>
-    <script type="text/javascript" src="../../test/spec/mkws-pazpar2.js"></script>
+    <script type="text/javascript" src="test/spec/true.spec.js"></script>
+    <script type="text/javascript" src="test/spec/mkws-config.js"></script>
+    <script type="text/javascript" src="test/spec/mkws-pazpar2.js"></script>
 
     <!-- init and run jasmine -->
-    <script type="text/javascript" src="../../test/js/mkws-jasmine-run.js"></script>
+    <script type="text/javascript" src="test/js/mkws-jasmine-run.js"></script>
     <script type="text/javascript">
       mkws_jasmine_init(500);
     </script>

diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html
index f4b3ec3..95bc9ca 100644 (file)
--- a/examples/htdocs/jasmine.html
+++ b/examples/htdocs/jasmine.html
@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo jasmine test framework</title>
-    <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
          perpage_default: 10
@@ -13,10 +13,10 @@
       };
     </script>
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/mkws.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
     <style type="text/css">
       #mkwsTermlists div.facet {
       float:left;
@@ -29,18 +29,18 @@
     </style>
 
   <!-- SECTION jasmine -->
-    <link rel="shortcut icon" type="image/png" href="../jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
-    <link rel="stylesheet" type="text/css" href="../jasmine/lib/jasmine-1.3.1/jasmine.css">
-    <script type="text/javascript" src="../jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
-    <script type="text/javascript" src="../jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
+    <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
+    <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-1.3.1/jasmine.css">
+    <script type="text/javascript" src="jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
+    <script type="text/javascript" src="jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
 
     <!-- include MKWS spec files ... -->
-    <script type="text/javascript" src="../../test/spec/true.spec.js"></script>
-    <script type="text/javascript" src="../../test/spec/mkws-config.js"></script>
-    <script type="text/javascript" src="../../test/spec/mkws-pazpar2.js"></script>
+    <script type="text/javascript" src="test/spec/true.spec.js"></script>
+    <script type="text/javascript" src="test/spec/mkws-config.js"></script>
+    <script type="text/javascript" src="test/spec/mkws-pazpar2.js"></script>
 
     <!-- init and run jasmine -->
-    <script type="text/javascript" src="../../test/js/mkws-jasmine-run.js"></script>
+    <script type="text/javascript" src="test/js/mkws-jasmine-run.js"></script>
     <script type="text/javascript">
       mkws_jasmine_init(500);
     </script>

diff --git a/examples/htdocs/wolfram.html b/examples/htdocs/wolfram.html
index 6210b1a..9c79171 100644 (file)
--- a/examples/htdocs/wolfram.html
+++ b/examples/htdocs/wolfram.html
@@ -4,20 +4,18 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Wolfram's playground</title>
-    <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
-       /*
          pazpar2_url : "/service-proxy/",
-         service_proxy_auth : "/service-proxy-auth/",
-         */
+         service_proxy_auth : "/service-proxy-auth"
       };
     </script>
-    <script type="text/javascript" src="../../tools/htdocs/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="../../tools/htdocs/mkws.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
     <style type="text/css">
       #mkwsTermlists div.facet {
       float:left;

diff --git a/examples/htdocs/wolfram2.html b/examples/htdocs/wolfram2.html
index 708f5ce..c7bd691 100644 (file)
--- a/examples/htdocs/wolfram2.html
+++ b/examples/htdocs/wolfram2.html
@@ -4,7 +4,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Wolfram's playground</title>
-    <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <style type="text/css">
       #mkwsTermlists div.facet {
       float:left;
@@ -50,7 +50,7 @@
       </tr>
     </table>
 
-    <script type="text/javascript" src="../../tools/htdocs/mkws-complete.js"></script>
+    <script type="text/javascript" src="tools/htdocs/mkws-complete.js"></script>
 
     <script type="text/javascript">
       var mkws_config = {

diff --git a/test/Makefile b/test/Makefile
index d4106a5..e2d8fc2 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,6 +2,7 @@
 
 # For running on Mike's local install of node.js
 MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
+NPM_INSTALL_FLAGS=-q
 
 all: check
 
@@ -14,10 +15,8 @@ mkws-complete-syntax-check:
        ${MAKE} -C../tools/htdocs $@
 
 check: mkws-complete-syntax-check
-       for i in ./spec/*.js; do \
-         echo "$$i"; \
-         jasmine-node --noColor --captureExceptions --forceexit $$i; \
-       done
+       jasmine-node --noColor --captureExceptions --forceexit ./spec
+       jasmine-node --noColor --captureExceptions --forceexit ./spec-sp
 
 test: check
 
@@ -31,7 +30,7 @@ jsbeautifier jsb indent:
 
 node-modules: node_modules
 node_modules:
-       npm install jQuery xmlhttprequest jsdom request jasmine-node
+       npm install ${NPM_INSTALL_FLAGS} jQuery xmlhttprequest jsdom request jasmine-node
 
 help:
        @echo "make [ all | check | clean | distclean ]"

diff --git a/test/spec-sp/mkws-index-jsdom.spec.js b/test/spec-sp/mkws-index-jsdom.spec.js
new file mode 100644 (file)
index 0000000..ea22425
--- /dev/null
+++ b/test/spec-sp/mkws-index-jsdom.spec.js
@@ -0,0 +1,56 @@
+/* Copyright (c) 2013 IndexData ApS. http://indexdata.com
+ *
+ * jQuery test with DOM/windows object
+ *
+ */
+
+
+var fs = require("fs");
+var utils = require("./mkws_utils.js");
+
+/*
+ * parse HTML data to DOM, and run jQuery request on it
+ *
+ */
+
+function jsdom_check(file, tags_array, ignore_doctype) {
+    var html = fs.readFileSync(file, "utf-8");
+    var tags = utils.flat_list(tags_array);
+
+    describe("local html file jsdom + jquery for " + file, function () {
+        var window = require('jsdom').jsdom(html, null, {
+            FetchExternalResources: false,
+            ProcessExternalResources: false,
+            MutationEvents: false,
+            QuerySelector: false
+        }).createWindow();
+
+        /* apply jquery to the window */
+        var $ = require('jQuery').create(window);
+
+
+        it("html jquery test", function () {
+            expect(html).toBeDefined();
+
+            expect($("body").length == 0).toEqual(false);
+            expect($("body").length == 1).toEqual(true);
+            expect($("head").length == 1).toEqual(true);
+
+            for (var i = 0; i < tags.length; i++) {
+                expect($("#" + tags[i]).length == 1).toEqual(true);
+            }
+        });
+
+        it("html jquery fail test", function () {
+            expect(html).toBeDefined();
+
+            expect($("body_does_not_exists").length == 1).toEqual(false);
+            expect($("#body_does_not_exists").length == 1).toEqual(false);
+        });
+    });
+}
+
+jsdom_check('../examples/htdocs/language.html', [utils.tags.required, utils.tags.optional, utils.tags.optional2]);
+jsdom_check('../examples/htdocs/mobile.html', [utils.tags.required, utils.tags.optional]);
+jsdom_check('../examples/htdocs/index.html', [utils.tags.required, utils.tags.optional]);
+

diff --git a/test/spec-sp/mkws_utils.js b/test/spec-sp/mkws_utils.js
new file mode 100644 (file)
index 0000000..3256f70
--- /dev/null
+++ b/test/spec-sp/mkws_utils.js
@@ -0,0 +1,43 @@
+/* Copyright (c) 2013 IndexData ApS. http://indexdata.com
+ *
+ * helper functions for other test *.spec.js files
+ *
+ */
+
+/*
+ * combine arrays, return a flat list
+ * [["a","b"], ["c"], "d"] => ["a", "b", "c", "d"]
+ *
+ */
+var flat_list = function (list) {
+        var data = [];
+
+        for (var i = 0; i < list.length; i++) {
+            if (typeof list[i] == 'object') {
+                for (var j = 0; j < list[i].length; j++) {
+                    data.push(list[i][j]);
+                }
+
+            } else {
+                data.push(list[i]);
+            }
+        }
+
+        return data;
+    };
+
+/*
+ * list of div id to check
+ *
+ */
+var tags = {
+    required: ["mkwsSearch", "mkwsResults"],
+    optional: ["mkwsLang", "mkwsTargets"],
+    optional2: ["mkwsMOTD", "mkwsStat", "footer"]
+};
+
+// node.js exports
+module.exports = {
+    flat_list: flat_list,
+    tags: tags
+};

diff --git a/test/spec/mkws-index-jsdom-remote.spec.js b/test/spec/mkws-index-jsdom-remote.spec.js
deleted file mode 100644 (file)
index c885d67..0000000
--- a/test/spec/mkws-index-jsdom-remote.spec.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright (c) 2013 IndexData ApS. http://indexdata.com
- *
- * jQuery test with DOM/windows object
- *
- */
-
-
-var fs = require("fs");
-var utils = require("./mkws_utils.js");
-
-/*
- * parse HTML data to DOM, and run jQuery request on it
- *
- */
-
-function jsdom_check(file, tags_array, ignore_doctype) {
-    var html = fs.readFileSync(file, "utf-8");
-    var tags = utils.flat_list(tags_array);
-
-    describe("language.html jsdom + jquery for " + file, function () {
-        var window = require('jsdom').jsdom(html, null, {
-            FetchExternalResources: false,
-            ProcessExternalResources: false,
-            MutationEvents: false,
-            QuerySelector: false
-        }).createWindow();
-
-        /* apply jquery to the window */
-        var $ = require('jquery').create(window);
-
-
-        it("html jquery test", function () {
-            expect(html).toBeDefined();
-
-            expect($("body").length == 0).toEqual(false);
-            expect($("body").length == 1).toEqual(true);
-            expect($("head").length == 1).toEqual(true);
-
-            for (var i = 0; i < tags.length; i++) {
-                expect($("#" + tags[i]).length == 1).toEqual(true);
-            }
-        });
-
-        it("html jquery fail test", function () {
-            expect(html).toBeDefined();
-
-            expect($("body_does_not_exists").length == 1).toEqual(false);
-            expect($("#body_does_not_exists").length == 1).toEqual(false);
-        });
-    });
-}
-
-/*
-jsdom_check('../examples/htdocs/language.html', [utils.tags.required, utils.tags.optional, utils.tags.optional2]);
-jsdom_check('../examples/htdocs/mobile.html', [utils.tags.required, utils.tags.optional]);
-jsdom_check('../examples/htdocs/popup.html', [], true);
-jsdom_check('../examples/htdocs/jquery.html', []);
-jsdom_check('../examples/htdocs/mike.html', [utils.tags.required, utils.tags.optional], true);
-*/

diff --git a/test/spec/mkws-index-jsdom.spec.js b/test/spec/mkws-index-jsdom.spec.js
deleted file mode 100644 (file)
index 471c03e..0000000
--- a/test/spec/mkws-index-jsdom.spec.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright (c) 2013 IndexData ApS. http://indexdata.com
- *
- * jQuery test with DOM/windows object
- *
- */
-
-
-var fs = require("fs");
-var utils = require("./mkws_utils.js");
-
-/*
- * parse HTML data to DOM, and run jQuery request on it
- *
- */
-
-function jsdom_check(file, tags_array, ignore_doctype) {
-    var html = fs.readFileSync(file, "utf-8");
-    var tags = utils.flat_list(tags_array);
-
-    describe("language.html jsdom + jquery for " + file, function () {
-        var window = require('jsdom').jsdom(html, null, {
-            FetchExternalResources: false,
-            ProcessExternalResources: false,
-            MutationEvents: false,
-            QuerySelector: false
-        }).createWindow();
-
-        /* apply jquery to the window */
-        var $ = require('jQuery').create(window);
-
-
-        it("html jquery test", function () {
-            expect(html).toBeDefined();
-
-            expect($("body").length == 0).toEqual(false);
-            expect($("body").length == 1).toEqual(true);
-            expect($("head").length == 1).toEqual(true);
-
-            for (var i = 0; i < tags.length; i++) {
-                expect($("#" + tags[i]).length == 1).toEqual(true);
-            }
-        });
-
-        it("html jquery fail test", function () {
-            expect(html).toBeDefined();
-
-            expect($("body_does_not_exists").length == 1).toEqual(false);
-            expect($("#body_does_not_exists").length == 1).toEqual(false);
-        });
-    });
-}
-
-jsdom_check('../examples/htdocs/language.html', [utils.tags.required, utils.tags.optional, utils.tags.optional2]);
-jsdom_check('../examples/htdocs/mobile.html', [utils.tags.required, utils.tags.optional]);
-jsdom_check('../examples/htdocs/popup.html', [], true);
-jsdom_check('../examples/htdocs/jquery.html', []);
-// jsdom_check('../examples/htdocs/mike.html', [utils.tags.required, utils.tags.optional], true);

diff --git a/test/spec/mkws-index-simple.spec.js b/test/spec/mkws-index-simple.spec.js
deleted file mode 100644 (file)
index a91acf7..0000000
--- a/test/spec/mkws-index-simple.spec.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (c) 2013 IndexData ApS. http://indexdata.com
- *
- * jQuery test with DOM/windows object
- *
- */
-
-
-var fs = require("fs");
-var utils = require("./mkws_utils.js");
-
-/*
- * simple test with string matching of the HTML page
- *
- */
-
-function html_check(file, tags_array, ignore_doctype) {
-    var html = fs.readFileSync(file, "utf-8");
-    var tags = utils.flat_list(tags_array);
-
-    describe("language.html string test for " + file, function () {
-        it("html test", function () {
-            expect(html).toBeDefined();
-
-            // forgotten doctype declaration
-            if (!ignore_doctype) {
-                expect(html).toMatch(/<html.*?>/);
-                expect(html).toMatch(/<\/html.*?>/);
-            }
-            expect(html).toMatch(/<head.*?>/);
-            expect(html).toMatch(/<body.*?>/);
-            expect(html).toMatch(/<\/head.*?>/);
-            expect(html).toMatch(/<\/body.*?>/);
-
-            expect(html).toMatch(/<meta .*?charset=utf-8/i);
-            expect(html).toMatch(/<title>.+<\/title>/i);
-            expect(html).toMatch(/<link .*?type="text\/css" href=".*?\/?mkws.css"/);
-
-
-            for (var i = 0, data = ""; i < tags.length; i++) {
-                data = '<div id="' + tags[i] + '">';
-                // console.log(data)
-                expect(html).toMatch(data);
-            }
-        });
-    });
-}
-
-html_check('../examples/htdocs/language.html', [utils.tags.required, utils.tags.optional, utils.tags.optional2]);
-html_check('../examples/htdocs/mobile.html', [utils.tags.required, utils.tags.optional]);
-html_check('../examples/htdocs/popup.html', [], true);
-html_check('../examples/htdocs/jquery.html', []);
-// html_check('../examples/htdocs/mike.html', [utils.tags.required, utils.tags.optional], true);

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 002a705..e017213 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -198,14 +198,16 @@ describe("Check Termlist", function () {
             }
         }, "Search for source in navi bar", 1000);
 
+       // Note: it may happens that limited source search returns the same number of hits
+       // as before. Thats not really an error, but unfortunate
         waitsFor(function () {
-            return get_hit_counter() < hits_all_targets ? true : false;
-        }, "Limited source earch for less than " + hits_all_targets + " hits", 9 * 1000);
+            return get_hit_counter() <= hits_all_targets ? true : false;
+        }, "Limited source search for less than " + hits_all_targets + " hits", 5 * 1000);
 
         runs(function () {
             var hits_single_target = get_hit_counter();
             debug("get less hits for sources: " + hits_all_targets + " > " + hits_single_target);
-            expect(hits_all_targets).toBeGreaterThan(hits_single_target);
+            expect(hits_all_targets).not.toBeLessThan(hits_single_target);
         });
     });
 });

diff --git a/test/spec/mkws_utils.js b/test/spec/mkws_utils.js
deleted file mode 100644 (file)
index 3256f70..0000000
--- a/test/spec/mkws_utils.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (c) 2013 IndexData ApS. http://indexdata.com
- *
- * helper functions for other test *.spec.js files
- *
- */
-
-/*
- * combine arrays, return a flat list
- * [["a","b"], ["c"], "d"] => ["a", "b", "c", "d"]
- *
- */
-var flat_list = function (list) {
-        var data = [];
-
-        for (var i = 0; i < list.length; i++) {
-            if (typeof list[i] == 'object') {
-                for (var j = 0; j < list[i].length; j++) {
-                    data.push(list[i][j]);
-                }
-
-            } else {
-                data.push(list[i]);
-            }
-        }
-
-        return data;
-    };
-
-/*
- * list of div id to check
- *
- */
-var tags = {
-    required: ["mkwsSearch", "mkwsResults"],
-    optional: ["mkwsLang", "mkwsTargets"],
-    optional2: ["mkwsMOTD", "mkwsStat", "footer"]
-};
-
-// node.js exports
-module.exports = {
-    flat_list: flat_list,
-    tags: tags
-};

diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index 4ca23d8..7dde2aa 100644 (file)
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -21,7 +21,7 @@
         SetOutputFilter DEFLATE 
     </Location> 
 
-    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
 
     ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
     ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index e3ed207..35f396a 100644 (file)
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -14,7 +14,7 @@
     RewriteEngine on
     RewriteLogLevel 1
     RewriteLog /var/log/apache2/mkws-rewrite.log 
-    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
+    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
 
     # The following rule allows the server to accept service-proxy
     # requests that begin with an escaped "%3F" rather than a literal
@@ -25,8 +25,8 @@
     Header set Access-Control-Allow-Credentials true
 
     # For MKC Service Proxy
-    ProxyPass        /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
+    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
 
     PerlOptions +Parent
     PerlSwitches -I/home/indexdata/mkws/tools/mod_perl