Tests inspect mkws.config rather than old mkws_config

diff --git a/test/spec/mkws-config.js b/test/spec/mkws-config.js
index 70ae891..d168fb2 100644 (file)
--- a/test/spec/mkws-config.js
+++ b/test/spec/mkws-config.js
@@ -4,25 +4,25 @@
  *
  */
 
-describe("Check mkws_config object", function () {
-    it("mkws_config exists", function () {
-        expect(mkws_config).not.toBe(undefined);
+describe("Check mkws.config object", function () {
+    it("mkws.config exists", function () {
+        expect(mkws.config).not.toBe(undefined);
     });
 
-    it("mkws_config locale check German", function () {
+    it("mkws.config locale check German", function () {
         expect(mkws.locale_lang.de.Authors).toMatch(/^Autoren$/);
         expect(mkws.locale_lang.de.Location).toMatch(/^Ort$/);
     });
-    it("mkws_config locale check Danish", function () {
+    it("mkws.config locale check Danish", function () {
         expect(mkws.locale_lang.da.Authors).toMatch(/^Forfattere$/);
         expect(mkws.locale_lang.da.Location).toMatch(/^Lokation$/);
     });
 
-    it("mkws_config service proxy enabled/disabled", function () {
-        if (mkws_config.use_service_proxy) {
-            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);
+            expect(mkws.config.use_service_proxy).toBe(false);
         }
     });
 
@@ -31,12 +31,12 @@ describe("Check mkws_config object", function () {
 
 describe("Check pazpar2 config", function () {
     it("pazpar2path is a path or an full URL", function () {
-        expect(mkws_config.pazpar2_url).toMatch(/^(\/|https?:\/\/)/)
+        expect(mkws.config.pazpar2_url).toMatch(/^(\/|https?:\/\/)/)
     });
 });
 
 describe("Check pazpar2 runtime", function () {
     it("pazpar2 was successfully initialized", function () {
-        expect(mkws_config.error).toBe(undefined);
+        expect(mkws.config.error).toBe(undefined);
     });
 });

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 3614152..2dab391 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -96,7 +96,7 @@ describe("Check MOTD before search", function () {
 
 describe("Check pazpar2 search", function () {
     it("pazpar2 was successfully initialized", function () {
-        expect(mkws_config.error).toBe(undefined);
+        expect(mkws.config.error).toBe(undefined);
     });
 
     it("validate HTML id's", function () {
@@ -113,7 +113,7 @@ describe("Check pazpar2 search", function () {
         debug("set search query: " + search_query)
         expect($("input.mkwsQuery").val()).toMatch("^" + search_query + "$");
 
-        if (mkws_config.use_service_proxy) {
+        if (mkws.config.use_service_proxy) {
             // wait for service proxy auth
             waitsFor(function () {
                 return mkws.authenticated;
@@ -229,7 +229,7 @@ describe("Check Termlist", function () {
     });
 
     it("limit search to first author", function () {
-        if (mkws_config.disable_facet_authors_search) {
+        if (mkws.config.disable_facet_authors_search) {
             debug("Facets: ignore limit search for authors");
             return;
         }