projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f0eb515
)
if running as raw pp2, don't wait for mkws auth, MKWS-82
author
Wolfram Schneider
<wosch@indexdata.dk>
Wed, 18 Dec 2013 16:49:01 +0000
(16:49 +0000)
committer
Wolfram Schneider
<wosch@indexdata.dk>
Wed, 18 Dec 2013 16:49:01 +0000
(16:49 +0000)
test/spec/mkws-pazpar2.js
patch
|
blob
|
history
diff --git
a/test/spec/mkws-pazpar2.js
b/test/spec/mkws-pazpar2.js
index
c063635
..
0a800c3
100644
(file)
--- a/
test/spec/mkws-pazpar2.js
+++ b/
test/spec/mkws-pazpar2.js
@@
-46,10
+46,14
@@
describe("Check pazpar2 search", function () {
debug("set search query: " + search_query)
expect($("input#mkwsQuery").val()).toMatch("^" + search_query + "$");
debug("set search query: " + search_query)
expect($("input#mkwsQuery").val()).toMatch("^" + search_query + "$");
- // wait for service proxy auth
- waitsFor(function () {
- return mkws.authenticated;
- }, "SP auth done", 10 * 1000);
+ if (mkws_config.use_service_proxy) {
+ // wait for service proxy auth
+ waitsFor(function () {
+ return mkws.authenticated;
+ }, "SP auth done", 10 * 1000);
+ } else {
+ debug("running raw pp2, don't wait for mkws auth");
+ }
runs(function () {
debug("Click on submit button");
runs(function () {
debug("Click on submit button");