projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XML parser test with jasmine
[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
f005ad8
..
64d9fd9
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);
});
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$/);
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$/);
});
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,15
+31,7
@@
describe("Check mkws_config object", function () {
describe("Check pazpar2 config", function () {
it("pazpar2path is a path or an full URL", function () {
describe("Check pazpar2 config", function () {
it("pazpar2path is a path or an full URL", function () {
- expect(mkws.pazpar2path).toMatch(/^(\/|http:\/\/)/)
- });
-
- it("usesessions false", function () {
- expect(mkws.usesessions).toBe(false);
- });
-
- it("my_paz is defined", function () {
- expect(mkws.my_paz).not.toBe(undefined);
+ expect(mkws_config.pazpar2_url).toMatch(/^(\/|https?:\/\/)/)
});
});
});
});