Skip to content

Commit 5badf0b

Browse files
committed
rebuild mocha.js for release v3.2.0 [ci skip]
1 parent b1d6b49 commit 5badf0b

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

mocha.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ module.exports = function (suites, context, mocha) {
833833
* This is only present if flag --delay is passed into Mocha. It triggers
834834
* root suite execution.
835835
*
836-
* @param {Suite} suite The root wuite.
836+
* @param {Suite} suite The root suite.
837837
* @return {Function} A function which runs the root suite
838838
*/
839839
runWithSuite: function runWithSuite (suite) {
@@ -3243,7 +3243,7 @@ function List (runner) {
32433243
});
32443244

32453245
runner.on('pass', function (test) {
3246-
var fmt = color('checkmark', ' ' + Base.symbols.dot) +
3246+
var fmt = color('checkmark', ' ' + Base.symbols.ok) +
32473247
color('pass', ' %s: ') +
32483248
color(test.speed, '%dms');
32493249
cursor.CR();
@@ -3973,7 +3973,7 @@ function XUnit (runner, options) {
39733973
var tests = [];
39743974
var self = this;
39753975

3976-
if (options.reporterOptions && options.reporterOptions.output) {
3976+
if (options && options.reporterOptions && options.reporterOptions.output) {
39773977
if (!fs.createWriteStream) {
39783978
throw new Error('file output not supported in browser');
39793979
}
@@ -4331,8 +4331,8 @@ Runnable.prototype.resetTimeout = function () {
43314331
if (!self._enableTimeouts) {
43324332
return;
43334333
}
4334-
self.callback(new Error('timeout! Test didn\'t complete within ' + ms +
4335-
'. For async tests, make sure you are calling \'done\' or that the returned Promise eventually resolves.'));
4334+
self.callback(new Error('Timeout of ' + ms +
4335+
'ms exceeded. For async tests and hooks, ensure "done()" is called; if returning a Promise, ensure it resolves.'));
43364336
self.timedOut = true;
43374337
}, ms);
43384338
};
@@ -4391,8 +4391,8 @@ Runnable.prototype.run = function (fn) {
43914391
self.duration = new Date() - start;
43924392
finished = true;
43934393
if (!err && self.duration > ms && self._enableTimeouts) {
4394-
err = new Error('timeout! Test didn\'t complete within ' + ms +
4395-
'. For async tests, make sure you are calling \'done\' or that the returned Promise eventually resolves.');
4394+
err = new Error('Timeout of ' + ms +
4395+
'ms exceeded. For async tests and hooks, ensure "done()" is called; if returning a Promise, ensure it resolves.');
43964396
}
43974397
fn(err);
43984398
}
@@ -5972,6 +5972,7 @@ var join = path.join;
59725972
var readdirSync = require('fs').readdirSync;
59735973
var statSync = require('fs').statSync;
59745974
var watchFile = require('fs').watchFile;
5975+
var lstatSync = require('fs').lstatSync;
59755976
var toISOString = require('./to-iso-string');
59765977

59775978
/**
@@ -6208,7 +6209,7 @@ exports.files = function (dir, ext, ret) {
62086209
.filter(ignored)
62096210
.forEach(function (path) {
62106211
path = join(dir, path);
6211-
if (statSync(path).isDirectory()) {
6212+
if (lstatSync(path).isDirectory()) {
62126213
exports.files(path, ext, ret);
62136214
} else if (path.match(re)) {
62146215
ret.push(path);

0 commit comments

Comments
 (0)