☕️ Classic, reliable, trusted test framework for Node.js and the browser
Release 1.14.0
TJ Holowaychukd230cf222c5b
diff --git a/History.md b/History.mdindex e529827a..a259b7a8 100644--- a/History.md+++ b/History.md@@ -1,4 +1,5 @@-1.14.0 / ???++1.14.0 / 2013-11-02==================* add: unified diff (#862)diff --git a/mocha.js b/mocha.jsindex 9c34f90d..9b7c1fa5 100644--- a/mocha.js+++ b/mocha.js@@ -1435,6 +1435,7 @@ function Mocha(options) {this.bail(options.bail);this.reporter(options.reporter);if (null != options.timeout) this.timeout(options.timeout);+ this.useColors(options.useColors)if (options.slow) this.slow(options.slow);}@@ -1475,12 +1476,15 @@ Mocha.prototype.reporter = function(reporter){this._reporter = reporter;} else {reporter = reporter || 'dot';- try {- this._reporter = require('./reporters/' + reporter);- } catch (err) {- this._reporter = require(reporter);- }- if (!this._reporter) throw new Error('invalid reporter "' + reporter + '"');+ var _reporter;+ try { _reporter = require('./reporters/' + reporter); } catch (err) {};+ if (!_reporter) try { _reporter = require(reporter); } catch (err) {};+ if (!_reporter && reporter === 'teamcity')+ console.warn('The Teamcity reporter was moved to a package named ' ++ 'mocha-teamcity-reporter ' ++ '(https://npmjs.org/package/mocha-teamcity-reporter).');+ if (!_reporter) throw new Error('invalid reporter "' + reporter + '"');+ this._reporter = _reporter;}return this;};@@ -1495,6 +1499,7 @@ Mocha.prototype.reporter = function(reporter){Mocha.prototype.ui = function(name){name = name || 'bdd';this._ui = exports.interfaces[name];+ if (!this._ui) try { this._ui = require(name); } catch (err) {};if (!this._ui) throw new Error('invalid interface "' + name + '"');this._ui = this._ui(this.suite);return this;@@ -1620,6 +1625,21 @@ Mocha.prototype.globals = function(globals){return this;};+/**+ * Emit color output.+ *+ * @param {Boolean} colors+ * @return {Mocha}+ * @api public+ */++Mocha.prototype.useColors = function(colors){+ this.options.useColors = arguments.length && colors != undefined+ ? colors+ : true;+ return this;+};+/*** Set the timeout in milliseconds.*@@ -1677,6 +1697,7 @@ Mocha.prototype.run = function(fn){if (options.grep) runner.grep(options.grep, options.invert);if (options.globals) runner.globals(options.globals);if (options.growl) this._growl(runner, reporter);+ exports.reporters.Base.useColors = options.useColors;return runner.run(fn);};@@ -1921,24 +1942,28 @@ exports.window = {exports.cursor = {hide: function(){- process.stdout.write('\u001b[?25l');+ isatty && process.stdout.write('\u001b[?25l');},show: function(){- process.stdout.write('\u001b[?25h');+ isatty && process.stdout.write('\u001b[?25h');},deleteLine: function(){- process.stdout.write('\u001b[2K');+ isatty && process.stdout.write('\u001b[2K');},beginningOfLine: function(){- process.stdout.write('\u001b[0G');+ isatty && process.stdout.write('\u001b[0G');},CR: function(){- exports.cursor.deleteLine();- exports.cursor.beginningOfLine();+ if (isatty) {+ exports.cursor.deleteLine();+ exports.cursor.beginningOfLine();+ } else {+ process.stdout.write('\n');+ }}};@@ -1982,10 +2007,13 @@ exports.list = function(failures){// actual / expected diffif ('string' == typeof actual && 'string' == typeof expected) {fmt = color('error title', ' %s) %s:\n%s') + color('error stack', '\n%s\n');+ var match = message.match(/^([^:]+): expected/);+ msg = match ? '\n ' + color('error message', match[1]) : '';+if (exports.inlineDiffs) {- msg = inlineDiff(err, escape);+ msg += inlineDiff(err, escape);} else {- msg = unifiedDiff(err, escape);+ msg += unifiedDiff(err, escape);}}@@ -2263,6 +2291,8 @@ function sameType(a, b) {return a == b;}++}); // module: reporters/base.jsrequire.register("reporters/doc.js", function(module, exports, require){@@ -2470,7 +2500,7 @@ var Date = global.Date, clearInterval = global.clearInterval;/**- * Expose `Doc`.+ * Expose `HTML`.*/exports = module.exports = HTML;@@ -2487,7 +2517,7 @@ var statsTemplate = '<ul id="mocha-stats">'+ '</ul>';/**- * Initialize a new `Doc` reporter.+ * Initialize a new `HTML` reporter.** @param {Runner} runner* @api public@@ -2552,7 +2582,7 @@ function HTML(runner, root) {if (suite.root) return;// suite- var url = '?grep=' + encodeURIComponent(suite.fullTitle());+ var url = self.suiteURL(suite);var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, escape(suite.title));// container@@ -2583,7 +2613,8 @@ function HTML(runner, root) {// testif ('passed' == test.state) {- var el = fragment('<li class="test pass %e"><h2>%e<span class="duration">%ems</span> <a href="?grep=%e" class="replay">‣</a></h2></li>', test.speed, test.title, test.duration, encodeURIComponent(test.fullTitle()));+ var url = self.testURL(test);+ var el = fragment('<li class="test pass %e"><h2>%e<span class="duration">%ems</span> <a href="%s" class="replay">‣</a></h2></li>', test.speed, test.title, test.duration, url);} else if (test.pending) {var el = fragment('<li class="test pass pending"><h2>%e</h2></li>', test.title);} else {@@ -2628,6 +2659,26 @@ function HTML(runner, root) {});}+/**+ * Provide suite URL+ *+ * @param {Object} [suite]+ */++HTML.prototype.suiteURL = function(suite){+ return '?grep=' + encodeURIComponent(suite.fullTitle());+};++/**+ * Provide test URL+ *+ * @param {Object} [test]+ */++HTML.prototype.testURL = function(test){+ return '?grep=' + encodeURIComponent(test.fullTitle());+};+/*** Display error `msg`.*/diff --git a/package.json b/package.jsonindex 71276ca7..11eb6ad0 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "mocha",- "version": "1.13.0",+ "version": "1.14.0","description": "simple, flexible, fun test framework","keywords": ["mocha",