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:
e76a62c
)
use window.mkws.$ object, MKWS-238
author
Wolfram Schneider
<wosch@indexdata.dk>
Mon, 7 Jul 2014 16:21:02 +0000
(16:21 +0000)
committer
Wolfram Schneider
<wosch@indexdata.dk>
Mon, 7 Jul 2014 16:21:02 +0000
(16:21 +0000)
test/phantom/run-jasmine.js
patch
|
blob
|
history
diff --git
a/test/phantom/run-jasmine.js
b/test/phantom/run-jasmine.js
index
27c465b
..
396417b
100644
(file)
--- a/
test/phantom/run-jasmine.js
+++ b/
test/phantom/run-jasmine.js
@@
-108,14
+108,14
@@
page.open(url, function (status) {
var exit = wait_for_jasmine(function () {
return page.evaluate(function () {
var exit = wait_for_jasmine(function () {
return page.evaluate(function () {
- if (!window || !window.$ || !window.mkws) {
+ if (!window || !window.mkws || !window.mkws.$) {
console.log("No window object found");
return false;
}
console.log("No window object found");
return false;
}
- var $ = window.$;
+ var $ = window.mkws.$;
var error_msg = [""];
var error_msg = [""];
- var passing = $(".passingAlert").text() || window.$(".failingAlert").text();
+ var passing = $(".passingAlert").text() || $(".failingAlert").text();
// extract failed tests
var list = $('.results > #details > .specDetail.failed');
// extract failed tests
var list = $('.results > #details > .specDetail.failed');