X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-config.js;h=70ae891918f4e440381ae71bcfd71d0d751c00be;hb=5710282758daaa01312c510231168058e587b63d;hp=e5189c0d7699c5e68674dfa66e8e86f37021ea56;hpb=b185ea6d84262b492e83f3359d51cf17b88966d5;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-config.js b/test/spec/mkws-config.js
index e5189c0..70ae891 100644
--- a/test/spec/mkws-config.js
+++ b/test/spec/mkws-config.js
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013 IndexData ApS. http://indexdata.com
+/* Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
  *
  * check mkws_config = {} object in browser
  *
@@ -9,21 +9,21 @@ 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$/);
+        expect(mkws.locale_lang.de.Authors).toMatch(/^Autoren$/);
+        expect(mkws.locale_lang.de.Location).toMatch(/^Ort$/);
     });
     it("mkws_config locale check Danish", function () {
-        expect(mkws_locale_lang.da.Authors).toMatch(/^Forfattere$/);
-        expect(mkws_locale_lang.da.Location).toMatch(/^Lokation$/);
+        expect(mkws.locale_lang.da.Authors).toMatch(/^Forfattere$/);
+        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,20 +31,12 @@ 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:\/\/)/)
-    });
-
-    it("usesessions false", function () {
-        expect(usesessions).toBe(false);
-    });
-
-    it("my_paz is defined", function () {
-        expect(my_paz).not.toBe(undefined);
+        expect(mkws_config.pazpar2_url).toMatch(/^(\/|https?:\/\/)/)
     });
 });
 
 describe("Check pazpar2 runtime", function () {
-    it("pazpar2 was successfully initialize", function () {
+    it("pazpar2 was successfully initialized", function () {
         expect(mkws_config.error).toBe(undefined);
     });
 });