.travis.yml

@@ -1,8 +1,13 @@
 language: node_js
+env:
+  global:
+   - CXX=g++-4.8
 before_install:
 - ./scripts/ensure-compatible-npm.sh
 script: travis_retry npm test
 node_js:
+- '5'
+- '4'
 - 'iojs'
 - '0.12'
 - '0.11'

HISTORY.md → CHANGELOG.md

@@ -1,3 +1,79 @@
+2.4.1 / 2016-01-26
+==================
+
+* [#2067] - Fix HTML/doc reporter regressions ([@danielstjules])
+
+[#2067]: https://github.com/mochajs/mocha/pull/2067
+
+2.4.0 / 2016-01-25
+==================
+
+* [#1945] - Correctly skip tests when skipping in suite's before() ([@ryanshawty])
+* [#2056] - chore(license): update license year to 2016 ([@pra85])
+* [#2048] - Fix `this.skip` from spec with HTML reporter ([@mislav])
+* [#2033] - Update tests for newer versions of should.js ([@tomhughes])
+* [#2037] - Fix for memory leak caused by referenced to deferred test ([@bd82])
+* [#2038] - Also run Travis-CI on node.js 4 & 5 ([@bd82])
+* [#2028] - Remove reference to test before afterAll hook runs ([@stonelgh])
+* Bump mkdirp to 0.5.1 to support strict mode ([@danielstjules])
+* [#1977] - safely stringify PhantomJS undefined value ([@ahamid])
+* Add the ability to retry tests ([@@longlho])
+* [#1982] - Enable --log-timer-events option [@Alaneor]
+* Fix #1980: Load mocha.opts from bin/mocha and bin/_mocha ([@danielstjules])
+* [#1976] - Simplify function call ([@iclanzan])
+* [#1963] - Add support --perf-basic-prof ([@robraux])
+* [#1981] - Fix HTML reporter handling of done and exceptions ([@Standard8])
+* [#1993] - propagate "file" property for "exports" interface ([@segrey])
+* [#1999] - Add support for strict mode ([@tmont])
+* [#2005] - XUnit Reporter Writes to stdout, falls back to console.log ([@jonnyreeves])
+* [#2021] - Fix non ES5 compliant regexp ([@zetaben])
+* [#1965] - Don't double install BDD UI ([@cowboyd])
+* [#1995] - Make sure the xunit output dir exists before writing to it ([@ianwremmel])
+* Use chalk for the base reporter colors; closes #1200 ([@boneskull])
+* Fix requiring custom interfaces ([@jgkim])
+* [#1967] Silence Bluebird js warnings ([@krisr])
+
+[#1945]: https://github.com/mochajs/mocha/pull/1945
+[#2056]: https://github.com/mochajs/mocha/pull/2056
+[#2048]: https://github.com/mochajs/mocha/pull/2048
+[#2033]: https://github.com/mochajs/mocha/pull/2033
+[#2037]: https://github.com/mochajs/mocha/pull/2037
+[#2038]: https://github.com/mochajs/mocha/pull/2038
+[#2028]: https://github.com/mochajs/mocha/pull/2028
+[#1977]: https://github.com/mochajs/mocha/pull/1977
+[#1982]: https://github.com/mochajs/mocha/pull/1982
+[#1976]: https://github.com/mochajs/mocha/pull/1976
+[#1963]: https://github.com/mochajs/mocha/pull/1963
+[#1981]: https://github.com/mochajs/mocha/pull/1981
+[#1993]: https://github.com/mochajs/mocha/pull/1993
+[#1999]: https://github.com/mochajs/mocha/pull/1999
+[#2005]: https://github.com/mochajs/mocha/pull/2005
+[#2021]: https://github.com/mochajs/mocha/pull/2021
+[1965#]: https://github.com/mochajs/mocha/pull/1965
+[#1995]: https://github.com/mochajs/mocha/pull/1995
+[#1967]: https://github.com/mochajs/mocha/pull/1967
+[@ryanshawty]: https://github.com/ryanshawty
+[@pra85]: https://github.com/pra85
+[@mislav]: https://github.com/mislav
+[@tomhughes]: https://github.com/tomhughes
+[@bd82]: https://github.com/bd82
+[@stonelgh]: https://github.com/stonelgh
+[@danielstjules]: https://github.com/danielstjules
+[@ahamid]: https://github.com/ahamid
+[@longlho]: https://github.com/longlho
+[@Alaneor]: https://github.com/Alaneor
+[@iclanzan]: https://github.com/iclanzan
+[@robraux]: https://github.com/robraux
+[@Standard8]: https://github.com/Standard8
+[@segrey]: https://github.com/segrey
+[@tmont]: https://github.com/tmont
+[@jonnyreeves]: https://github.com/jonnyreeves
+[@zetaben]: https://github.com/zetaben
+[@cowboyd]: https://github.com/cowboyd
+[@ianwremmel]: https://github.com/ianwremmel
+[@boneskull]: https://github.com/boneskull
+[@jgkim]: https://github.com/jgkim
+[@krisr]: https://github.com/krisr
 
 2.3.4 / 2015-11-15
 ==================

LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2011-2015 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2011-2016 TJ Holowaychuk <tj@vision-media.ca>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

Makefile

@@ -112,6 +112,11 @@ test-only:
 		--ui bdd \
 		test/acceptance/misc/only/bdd
 
+	@./bin/mocha \
+		--reporter $(REPORTER) \
+		--ui qunit \
+		test/acceptance/misc/only/bdd-require
+
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		--ui qunit \

bin/_mocha

@@ -89,12 +89,16 @@ program
   .option('--no-exit', 'require a clean shutdown of the event loop: mocha will not call process.exit')
   .option('--no-timeouts', 'disables timeouts, given implicitly with --debug')
   .option('--opts <path>', 'specify opts path', 'test/mocha.opts')
+  .option('--perf-basic-prof', 'enable perf linux profiler (basic support)')
   .option('--prof', 'log statistical profiling information')
+  .option('--log-timer-events', 'Time events including external callbacks')
   .option('--recursive', 'include sub directories')
   .option('--reporters', 'display available reporters')
+  .option('--retries <times>', 'set numbers of time to retry a failed test case')
   .option('--throw-deprecation', 'throw an exception anytime a deprecated function is used')
   .option('--trace', 'trace function calls')
   .option('--trace-deprecation', 'show stack traces on deprecations')
+  .option('--use_strict', 'enforce strict mode')
   .option('--watch-extensions <ext>,...', 'additional extensions to monitor with --watch', list, [])
   .option('--delay', 'wait for async suite definition')
 
@@ -169,9 +173,10 @@ program.on('require', function(mod){
   requires.push(mod);
 });
 
-// load mocha.opts into process.argv
-
-getOptions();
+// If not already done, load mocha.opts
+if (!process.env.LOADED_MOCHA_OPTS) {
+  getOptions();
+}
 
 // parse args
 
@@ -201,12 +206,9 @@ if (program.reporterOptions !== undefined) {
 
 mocha.reporter(program.reporter, reporterOptions);
 
-// interface
-
-mocha.ui(program.ui);
-
 // load reporter
 
+var Reporter = null;
 try {
   Reporter = require('../lib/reporters/' + program.reporter);
 } catch (err) {
@@ -284,6 +286,10 @@ if (program.delay) mocha.delay();
 
 mocha.globals(globals);
 
+// --retries
+
+if (program.retries) mocha.suite.retries(program.retries);
+
 // custom compiler support
 
 var extensions = ['js'];
@@ -304,6 +310,10 @@ requires.forEach(function(mod) {
   require(mod);
 });
 
+// interface
+
+mocha.ui(program.ui);
+
 //args
 
 var args = program.args;

bin/mocha

@@ -8,8 +8,13 @@
 var spawn = require('child_process').spawn,
   path = require('path'),
   fs = require('fs'),
+  getOptions = require('./options'),
   args = [path.join(__dirname, '_mocha')];
 
+// Load mocha.opts into process.argv
+// Must be loaded here to handle node-specific options
+getOptions();
+
 process.argv.slice(2).forEach(function(arg){
   var flag = arg.split('=')[0];
 
@@ -32,9 +37,12 @@ process.argv.slice(2).forEach(function(arg){
     case '--es_staging':
     case '--no-deprecation':
     case '--prof':
+    case '--log-timer-events':
     case '--throw-deprecation':
     case '--trace-deprecation':
+    case '--use_strict':
     case '--allow-natives-syntax':
+    case '--perf-basic-prof':
       args.unshift(arg);
       break;
     default:

bin/options.js

@@ -34,4 +34,6 @@ function getOptions() {
   } catch (err) {
     // ignore
   }
+
+  process.env.LOADED_MOCHA_OPTS = true;
 }

component.json

@@ -1,6 +1,6 @@
 {
   "name": "mocha",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "repo": "mochajs/mocha",
   "description": "simple, flexible, fun test framework",
   "keywords": [

lib/context.js

@@ -76,6 +76,21 @@ Context.prototype.skip = function() {
   return this;
 };
 
+/**
+ * Allow a number of retries on failed tests
+ *
+ * @api private
+ * @param {number} n
+ * @return {Context} self
+ */
+Context.prototype.retries = function(n) {
+  if (!arguments.length) {
+    return this.runnable().retries();
+  }
+  this.runnable().retries(n);
+  return this;
+};
+
 /**
  * Inspect the context void of `._runnable`.
  *

lib/interfaces/bdd.js

@@ -77,7 +77,7 @@ module.exports = function(suite) {
      * acting as a thunk.
      */
 
-    context.it = context.specify = function(title, fn) {
+    var it = context.it = context.specify = function(title, fn) {
       var suite = suites[0];
       if (suite.pending) {
         fn = null;
@@ -93,7 +93,7 @@ module.exports = function(suite) {
      */
 
     context.it.only = function(title, fn) {
-      var test = context.it(title, fn);
+      var test = it(title, fn);
       var reString = '^' + escapeRe(test.fullTitle()) + '$';
       mocha.grep(new RegExp(reString));
       return test;
@@ -106,5 +106,12 @@ module.exports = function(suite) {
     context.xit = context.xspecify = context.it.skip = function(title) {
       context.it(title);
     };
+
+    /**
+     * Number of attempts to retry.
+     */
+    context.it.retries = function(n) {
+      context.retries(n);
+    };
   });
 };

lib/interfaces/common.js

@@ -70,6 +70,15 @@ module.exports = function(suites, context) {
        */
       skip: function(title) {
         context.test(title);
+      },
+
+      /**
+       * Number of retry attempts
+       *
+       * @param {string} n
+       */
+      retries: function(n) {
+        context.retries(n);
       }
     }
   };

lib/interfaces/exports.js

@@ -53,7 +53,7 @@ module.exports = function(suite) {
       } else {
         suite = Suite.create(suites[0], key);
         suites.unshift(suite);
-        visit(obj[key]);
+        visit(obj[key], file);
         suites.shift();
       }
     }

lib/interfaces/qunit.js

@@ -89,5 +89,6 @@ module.exports = function(suite) {
     };
 
     context.test.skip = common.test.skip;
+    context.test.retries = common.test.retries;
   });
 };

lib/interfaces/tdd.js

@@ -101,5 +101,6 @@ module.exports = function(suite) {
     };
 
     context.test.skip = common.test.skip;
+    context.test.retries = common.test.retries;
   });
 };

lib/mocha.js

@@ -62,6 +62,7 @@ function image(name) {
  *   - `reporter` reporter instance, defaults to `mocha.reporters.spec`
  *   - `globals` array of accepted globals
  *   - `timeout` timeout in milliseconds
+ *   - `retries` number of times to retry failed tests
  *   - `bail` bail on the first test failure
  *   - `slow` milliseconds to wait before considering a test slow
  *   - `ignoreLeaks` ignore global leaks
@@ -88,6 +89,9 @@ function Mocha(options) {
   if (typeof options.timeout !== 'undefined' && options.timeout !== null) {
     this.timeout(options.timeout);
   }
+  if (typeof options.retries !== 'undefined' && options.retries !== null) {
+    this.retries(options.retries);
+  }
   this.useColors(options.useColors);
   if (options.enableTimeouts !== null) {
     this.enableTimeouts(options.enableTimeouts);
@@ -209,14 +213,13 @@ Mocha.prototype.ui = function(name) {
 Mocha.prototype.loadFiles = function(fn) {
   var self = this;
   var suite = this.suite;
-  var pending = this.files.length;
   this.files.forEach(function(file) {
     file = path.resolve(file);
     suite.emit('pre-require', global, file, self);
     suite.emit('require', require(file), file, self);
     suite.emit('post-require', global, file, self);
-    --pending || (fn && fn());
   });
+  fn && fn();
 };
 
 /**
@@ -372,6 +375,18 @@ Mocha.prototype.timeout = function(timeout) {
   return this;
 };
 
+/**
+ * Set the number of times to retry failed tests.
+ *
+ * @param {Number} retry times
+ * @return {Mocha}
+ * @api public
+ */
+Mocha.prototype.retries = function(n) {
+  this.suite.retries(n);
+  return this;
+};
+
 /**
  * Set slowness threshold in milliseconds.
  *