fixed #390 - casper.start().wait(x, fn) makes test hang on fail

zhangjunah · May 9, 2013 · e10a470 · e10a470
1 parent 8ee6b14
commit e10a470
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/modules/casper.js b/modules/casper.js
@@ -1946,7 +1946,11 @@ Casper.prototype.wait = function wait(timeout, then) {
         setTimeout(function _check(self) {
             self.log(f("wait() finished waiting for %dms.", timeout), "info");
             if (then) {
-                then.call(self, self);
+                try {
+                    then.call(self, self);
+                } catch (error) {
+                    self.emit('wait.error', error);
+                }
             }
             self.waitDone();
         }, timeout, this);

diff --git a/modules/tester.js b/modules/tester.js
@@ -191,6 +191,7 @@ var Tester = function Tester(casper, options) {
     }
 
     [
+        'wait.error',
         'waitFor.timeout.error',
         'event.error',
         'step.error',