X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-config.js;h=70ae891918f4e440381ae71bcfd71d0d751c00be;hb=32c02dc6ca86cf29c6b24f4622635296d0981361;hp=8cf22e200ce8e3e5ec5021350a556958ec67bce9;hpb=c5d1ba8a251f55565705b4864da7b24bcf8cf307;p=mkws-moved-to-github.git diff --git a/test/spec/mkws-config.js b/test/spec/mkws-config.js index 8cf22e2..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,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,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(mkws.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); }); });