paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 21:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

casperjs: Immediately check the condition in waitFor and don't wait after the condition is true

Browse Source 
Normally, casper delays checking the waitFor condition for 100 milliseconds and
further does not act on that check for another 100 milliseconds.  This is just
silly.

(imported from commit ad046ceda81abda5c609ce25ef0d4fb27d3da716)
This commit is contained in:
Zev Benjamin
2014-03-07 15:24:04 -05:00
committed by Steve Howell
parent 39f632134d
commit 5fd58cf249
1 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
zerver/tests/frontend/casperjs/modules/casper.js
View File

@@ -1708,30 +1708,45 @@ Casper.prototype.waitFor = function waitFor(testFx, then, onTimeout, timeout) {
}
return this.then(function _step() {
this.waitStart();
var self = this;
var interval;
var start = new Date().getTime();
var condition = false;
var interval = setInterval(function _check(self, testFx, timeout, onTimeout) {
if ((new Date().getTime() - start < timeout) && !condition) {
condition = testFx.call(self, self);
} else {
self.waitDone();
if (!condition) {
self.log("Casper.waitFor() timeout", "warning");
self.emit('waitFor.timeout');
var onWaitTimeout = onTimeout ? onTimeout : self.options.onWaitTimeout;
if (!utils.isFunction(onWaitTimeout)) {
throw new CasperError('Invalid timeout function, exiting.');
}
onWaitTimeout.call(self, timeout);
} else {
self.log(f("waitFor() finished in %dms.", new Date().getTime() - start), "info");
if (then) {
then.call(self, self);
}
}
clearInterval(interval);
var condition = testFx.call(self, self);
function _waitFinished () {
self.log(f("waitFor() finished in %dms.", new Date().getTime() - start), "info");
if (then) {
then.call(self, self);
}
}, 100, this, testFx, timeout, onTimeout);
}
if (condition) {
self.waitDone();
_waitFinished();
return;
}
interval = setInterval(function _check(testFx, timeout, onTimeout) {
var timedOut = (new Date().getTime() - start > timeout);
if (!timedOut && !condition) {
condition = testFx.call(self, self);
if (!condition) {
return;
}
}
// Either we timed out or the condition is true
self.waitDone();
clearInterval(interval);
if (timedOut) {
self.log("Casper.waitFor() timeout", "warning");
self.emit('waitFor.timeout');
var onWaitTimeout = onTimeout ? onTimeout : self.options.onWaitTimeout;
if (!utils.isFunction(onWaitTimeout)) {
throw new CasperError('Invalid timeout function, exiting.');
}
onWaitTimeout.call(self, timeout);
} else {
_waitFinished();
}
}, 100, testFx, timeout, onTimeout);
});
};