projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: dd672b9)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 18 Dec 2013 16:25:53 +0000 (16:25 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 18 Dec 2013 16:25:53 +0000 (16:25 +0000)
examples/htdocs/jasmine-pp2.html [new file with mode: 0644] patch | blob
examples/htdocs/jasmine.html patch | blob | history
test/spec/mkws-config.js patch | blob | history
tools/htdocs/mkws.js patch | blob | history

diff --git a/examples/htdocs/jasmine-pp2.html b/examples/htdocs/jasmine-pp2.html
new file mode 100644 (file)
index 0000000..b0b1c4c
--- /dev/null
+++ b/examples/htdocs/jasmine-pp2.html
@@ -0,0 +1,83 @@
+<html>
+  <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" />
+    <script type="text/javascript">
+      var mkws_config = {
+         use_service_proxy: false,
+         pazpar2_url : "/pazpar2/",
+         perpage_default: 10
+      };
+    </script>
+    <script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
+    <script type="text/javascript" src="http://mkws.indexdata.com/pazpar2/js/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;
+      width: 30%;
+      margin: 0.3em;
+      }
+      #mkwsStat {
+      text-align: right;
+      }
+    </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>
+
+    <!-- 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>
+
+    <!-- init and run jasmine -->
+    <script type="text/javascript" src="../../test/js/mkws-jasmine-run.js"></script>
+    <script type="text/javascript">
+      mkws_jasmine_init(500);
+    </script>
+  <!-- EOF jasmine -->
+
+  </head>
+  <body>
+    <table width="100%" border="0">
+      <tr>
+        <td>
+          <div id="mkwsSwitch"></div>
+          <div id="mkwsLang"></div>
+          <div id="mkwsSearch"></div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div style="height:500px; overflow: auto">
+            <div id="mkwsPager"></div>
+            <div id="mkwsNavi"></div>
+            <div id="mkwsRecords"></div>
+            <div id="mkwsTargets"></div>
+            <div id="mkwsRanking"></div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div style="height:300px; overflow: hidden">
+            <div id="mkwsTermlists"></div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div id="mkwsStat"></div>
+        </td>
+      </tr>
+    </table>
+
+  </body>
+</html>
diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html
index d827e27..f9f034b 100644 (file)
--- a/examples/htdocs/jasmine.html
+++ b/examples/htdocs/jasmine.html
@@ -5,6 +5,7 @@
     <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
+         perpage_default: 10
          /*
          pazpar2_url : "/service-proxy/",
          service_proxy_auth : "/service-proxy-auth/",
diff --git a/test/spec/mkws-config.js b/test/spec/mkws-config.js
index 1c530fa..6ec792d 100644 (file)
--- a/test/spec/mkws-config.js
+++ b/test/spec/mkws-config.js
@@ -18,8 +18,12 @@ describe("Check mkws_config object", function () {
         expect(mkws.locale_lang.da.Location).toMatch(/^Lokation$/);
     });
 
-    it("mkws_config service proxy enabled", function () {
-        expect(mkws_config.use_service_proxy).toBe(true);
+    it("mkws_config service proxy enabled/disabled", function () {
+        if (mkws_config.use_service_proxy) {
+            expect(mkws_config.use_service_proxy).toBe(true);
+        } else {
+            expect(mkws_config.use_service_proxy).toBe(false);
+        }
     });
 
 });
@@ -30,8 +34,12 @@ describe("Check pazpar2 config", function () {
         expect(mkws_config.pazpar2_url).toMatch(/^(\/|http:\/\/)/)
     });
 
-    it("usesessions false", function () {
-        expect(mkws.usesessions).toBe(false);
+    it("Check usesessions true/false", function () {
+        if (mkws_config.use_service_proxy) {
+            expect(mkws.usesessions).toBe(false);
+        } else {
+            expect(mkws.usesessions).toBe(true);
+        }
     });
 
     it("my_paz is defined", function () {
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 658f849..10a3915 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -422,7 +422,7 @@ function onFormSubmitEventHandler()
 
 function newSearch(query, sort, targets)
 {
-    if (!mkws.authenticated) {
+    if (mkws_config.use_service_proxy && !mkws.authenticated) {
        alert("searching before authentication");
        return;
     }
MasterKey Widget Set