projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a00a2a6
)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
author
Heikki Levanto
<heikki@indexdata.dk>
Fri, 7 Mar 2014 12:45:36 +0000
(13:45 +0100)
committer
Heikki Levanto
<heikki@indexdata.dk>
Fri, 7 Mar 2014 12:45:36 +0000
(13:45 +0100)
Conflicts:
test/spec/mkws-pazpar2.js
test/spec/mkws-pazpar2.js
patch
|
blob
|
history
diff --git
a/test/spec/mkws-pazpar2.js
b/test/spec/mkws-pazpar2.js
index
104a606
..
e459931
100644
(file)
--- a/
test/spec/mkws-pazpar2.js
+++ b/
test/spec/mkws-pazpar2.js
@@
-313,7
+313,6
@@
describe("Show record", function () {
var record_number = 1; // the Nth record in hit list
it("show record author", function () {
$("div.mkwsRecords div.record:nth-child(" + record_number + ") a").trigger("click");
-
// wait until the record pops up
waitsFor(function () {
var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") div");