Saving timer references to avoid Sinon interfering.

Closes mochajs#237, mochajs#320.
mtscout6 · Apr 17, 2012 · 4c160d7 · 4c160d7
1 parent 98aad6e
commit 4c160d7
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 0 deletions.
diff --git a/bin/_mocha b/bin/_mocha
@@ -20,6 +20,16 @@ var program = require('commander')
   , join = path.join
   , cwd = process.cwd();
 
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
 /**
  * Files.
  */

diff --git a/lib/reporters/base.js b/lib/reporters/base.js
@@ -6,6 +6,16 @@
 var tty = require('tty')
   , diff = require('diff');
 
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
 /**
  * Check if both stdio streams are associated with a tty.
  */

diff --git a/lib/reporters/html.js b/lib/reporters/html.js
@@ -8,6 +8,16 @@ var Base = require('./base')
   , Progress = require('../browser/progress')
   , escape = utils.escape;
 
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
 /**
  * Expose `Doc`.
  */

diff --git a/lib/reporters/xunit.js b/lib/reporters/xunit.js
@@ -7,6 +7,16 @@ var Base = require('./base')
   , utils = require('../utils')
   , escape = utils.escape;
 
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
 /**
  * Expose `XUnit`.
  */

diff --git a/lib/runnable.js b/lib/runnable.js
@@ -6,6 +6,16 @@
 var EventEmitter = require('events').EventEmitter
   , debug = require('debug')('runnable');
 
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
 /**
  * Expose `Runnable`.
  */