run with pp2 and sp

[mkws-moved-to-github.git] / test / spec / mkws-config.js

diff --git a/test/spec/mkws-config.js b/test/spec/mkws-config.js
index 8cf22e2..6ec792d 100644 (file)
--- a/test/spec/mkws-config.js
+++ b/test/spec/mkws-config.js
@@ -9,10 +9,6 @@ describe("Check mkws_config object", function () {
         expect(mkws_config).not.toBe(undefined);
     });
 
-    it("mkws_config service proxy config", function () {
-        expect(mkws_config.service_proxy_url).toBe(undefined);
-    });
-
     it("mkws_config locale check German", function () {
         expect(mkws.locale_lang.de.Authors).toMatch(/^Autoren$/);
         expect(mkws.locale_lang.de.Location).toMatch(/^Ort$/);
@@ -22,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);
+        }
     });
 
 });
@@ -31,11 +31,15 @@ describe("Check mkws_config object", function () {
 
 describe("Check pazpar2 config", function () {
     it("pazpar2path is a path or an full URL", function () {
-        expect(pazpar2path).toMatch(/^(\/|http:\/\/)/)
+        expect(mkws_config.pazpar2_url).toMatch(/^(\/|http:\/\/)/)
     });
 
-    it("usesessions false", function () {
-        expect(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 () {