Merge pull request mochajs#2560 from jeversmann/add/new-timeout-message

Add a more clear timeout message. Closes mochajs#2294
TwineHealth · Oct 29, 2016 · f32b53d · f32b53d
2 parents f207156 + 0294762
commit f32b53d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/runnable.js b/lib/runnable.js
@@ -229,7 +229,8 @@ Runnable.prototype.resetTimeout = function () {
     if (!self._enableTimeouts) {
       return;
     }
-    self.callback(new Error('timeout of ' + ms + 'ms exceeded. Ensure the done() callback is being called in this test.'));
+    self.callback(new Error('timeout! Test didn\'t complete within ' + ms +
+      '. For async tests, make sure you are calling \'done\' or that the returned Promise eventually resolves.'));
     self.timedOut = true;
   }, ms);
 };
@@ -288,7 +289,8 @@ Runnable.prototype.run = function (fn) {
     self.duration = new Date() - start;
     finished = true;
     if (!err && self.duration > ms && self._enableTimeouts) {
-      err = new Error('timeout of ' + ms + 'ms exceeded. Ensure the done() callback is being called in this test.');
+      err = new Error('timeout! Test didn\'t complete within ' + ms +
+        '. For async tests, make sure you are calling \'done\' or that the returned Promise eventually resolves.');
     }
     fn(err);
   }

diff --git a/mocha.js b/mocha.js
@@ -4331,7 +4331,8 @@ Runnable.prototype.resetTimeout = function () {
     if (!self._enableTimeouts) {
       return;
     }
-    self.callback(new Error('timeout of ' + ms + 'ms exceeded. Ensure the done() callback is being called in this test.'));
+    self.callback(new Error('timeout! Test didn\'t complete within ' + ms +
+      '. For async tests, make sure you are calling \'done\' or that the returned Promise eventually resolves.'));
     self.timedOut = true;
   }, ms);
 };
@@ -4390,7 +4391,8 @@ Runnable.prototype.run = function (fn) {
     self.duration = new Date() - start;
     finished = true;
     if (!err && self.duration > ms && self._enableTimeouts) {
-      err = new Error('timeout of ' + ms + 'ms exceeded. Ensure the done() callback is being called in this test.');
+      err = new Error('timeout! Test didn\'t complete within ' + ms +
+        '. For async tests, make sure you are calling \'done\' or that the returned Promise eventually resolves.');
     }
     fn(err);
   }