fix timeout to allow fake timers

features/fake_time.feature

@@ -0,0 +1,47 @@
+Feature: Allow time to be faked by utilities such as sinon.useFakeTimers
+  Background: Before and After hooks to enable faking time.
+    Given a file named "features/support/hooks.js" with:
+    """
+    var sinon = require('sinon');
+    var hooks = function () {
+
+      this.Before(function(scenario) {
+        this.clock = sinon.useFakeTimers();
+      });
+
+      this.After(function(scenario) {
+        this.clock.restore();
+      });
+
+    };
+    module.exports = hooks;
+    """
+
+  Scenario: faked time doesn't trigger the test runner timeout
+    Given a file named "features/passing_steps.feature" with:
+      """
+      Feature: a feature
+        Scenario: a scenario
+          Given a faked time step
+      """
+
+    Given a file named "features/step_definitions/passing_steps.js" with:
+      """
+      var assert = require('assert');
+      var sinon = require('sinon')
+
+      stepDefinitions = function() {
+        this.Given(/^a faked time step$/, function (done) {
+          var testFunction = sinon.stub();
+          setTimeout(testFunction, 10000);
+          assert(!testFunction.called);
+          this.clock.tick(10001);
+          assert(testFunction.called);
+          done()
+        });
+      };
+
+      module.exports = stepDefinitions
+      """
+      When I run cucumber.js with `--strict`
+      Then it passes

lib/cucumber/support_code/step_definition.js

@@ -6,7 +6,7 @@ function StepDefinition(pattern, options, code, uri, line) {
       return process.hrtime();
     }
     else {
-      return new Date().getTime();
+      return new Cucumber.Util.RealTime.Date().getTime();
     }
   }
 
@@ -16,7 +16,7 @@ function StepDefinition(pattern, options, code, uri, line) {
       return duration[0] * 1e9 + duration[1];
     }
     else {
-      return (new Date().getTime() - start) * 1e6;
+      return (new Cucumber.Util.RealTime.Date().getTime() - start) * 1e6;
     }
   }
 

lib/cucumber/util.js

@@ -2,6 +2,7 @@ var Util       = {};
 Util.Arguments = require('./util/arguments');
 Util.asyncForEach = require('./util/async_for_each');
 Util.Exception = require('./util/exception');
+Util.RealTime  = require('./util/real_time');
 Util.RegExp    = require('./util/reg_exp');
 Util.run    = require('./util/run');
 Util.String    = require('./util/string');

lib/cucumber/util/real_time.js

@@ -0,0 +1,9 @@
+module.exports = {
+  Date: Date,
+  setTimeout: setTimeout,
+  clearTimeout: clearTimeout,
+  setInterval: setInterval,
+  clearInterval: clearInterval,
+  setImmediate: setImmediate,
+  clearImmediate: clearImmediate
+};

lib/cucumber/util/run.js

@@ -8,15 +8,15 @@ function run(fn, thisArg, argsArray, timeoutInMilliseconds, callback) {
   function finish(error, result) {
     Cucumber.Util.Exception.unregisterUncaughtExceptionHandler(finish);
     if (timeoutId) {
-      clearTimeout(timeoutId);
+      Cucumber.Util.RealTime.clearTimeout(timeoutId);
     }
     callback(error, result);
     callback = function() {};
   }
 
   argsArray.push(finish);
 
-  timeoutId = setTimeout(function(){
+  timeoutId = Cucumber.Util.RealTime.setTimeout(function(){
     finish('function timed out after ' + timeoutInMilliseconds + ' milliseconds');
   }, timeoutInMilliseconds);
 

package.json

@@ -127,6 +127,7 @@
     "pogo": "^0.10.0",
     "rimraf": "^2.4.3",
     "serve-static": "^1.10.0",
+    "sinon": "^1.17.3",
     "through": "^2.3.8",
     "tmp": "0.0.28",
     "uglifyify": "^3.0.1"