resolves mochajs#1300: passing 0 to timeout() will disable timeouts

tandrewnichols · Dec 15, 2014 · 35e296c · 35e296c
1 parent 6958ce3
commit 35e296c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/runnable.js b/lib/runnable.js
@@ -64,6 +64,7 @@ Runnable.prototype.__proto__ = EventEmitter.prototype;
 
 Runnable.prototype.timeout = function(ms){
   if (0 == arguments.length) return this._timeout;
+  if (ms === 0) this._enableTimeouts = false;
   if ('string' == typeof ms) ms = milliseconds(ms);
   debug('timeout %d', ms);
   this._timeout = ms;

diff --git a/test/acceptance/timeout.js b/test/acceptance/timeout.js
@@ -25,5 +25,11 @@ describe('timeouts', function(){
       this.timeout(1);
       setTimeout(done, 2);
     });
+
+    it('should work with timeout(0)', function(done) {
+      this.timeout(0);
+      setTimeout(done, 1);
+    })
   });
+
 })