mocha 6.0.0-1 → 6.0.0

package/CHANGELOG.md

@@ -1,3 +1,41 @@
+# 6.0.0 / 2019-02-18
+
+## :tada: Enhancements
+
+- [#3726](https://github.com/mochajs/mocha/issues/3726): Add ability to unload files from `require` cache ([**@plroebuck**](https://github.com/plroebuck))
+
+## :bug: Fixes
+
+- [#3737](https://github.com/mochajs/mocha/issues/3737): Fix falsy values from options globals ([**@plroebuck**](https://github.com/plroebuck))
+- [#3707](https://github.com/mochajs/mocha/issues/3707): Fix encapsulation issues for `Suite#_onlyTests` and `Suite#_onlySuites` ([**@vkarpov15**](https://github.com/vkarpov15))
+- [#3711](https://github.com/mochajs/mocha/issues/3711): Fix diagnostic messages dealing with plurality and markup of output ([**@plroebuck**](https://github.com/plroebuck))
+- [#3723](https://github.com/mochajs/mocha/issues/3723): Fix "reporter-option" to allow comma-separated options ([**@boneskull**](https://github.com/boneskull))
+- [#3722](https://github.com/mochajs/mocha/issues/3722): Fix code quality and performance of `lookupFiles` and `files` ([**@plroebuck**](https://github.com/plroebuck))
+- [#3650](https://github.com/mochajs/mocha/issues/3650), [#3654](https://github.com/mochajs/mocha/issues/3654): Fix noisy error message when no files found ([**@craigtaub**](https://github.com/craigtaub))
+- [#3632](https://github.com/mochajs/mocha/issues/3632): Tests having an empty title are no longer confused with the "root" suite ([**@juergba**](https://github.com/juergba))
+- [#3666](https://github.com/mochajs/mocha/issues/3666): Fix missing error codes ([**@vkarpov15**](https://github.com/vkarpov15))
+- [#3684](https://github.com/mochajs/mocha/issues/3684): Fix exiting problem in Node.js v11.7.0+ ([**@addaleax**](https://github.com/addaleax))
+- [#3691](https://github.com/mochajs/mocha/issues/3691): Fix `--delay` (and other boolean options) not working in all cases ([**@boneskull**](https://github.com/boneskull))
+- [#3692](https://github.com/mochajs/mocha/issues/3692): Fix invalid command-line argument usage not causing actual errors ([**@boneskull**](https://github.com/boneskull))
+- [#3698](https://github.com/mochajs/mocha/issues/3698), [#3699](https://github.com/mochajs/mocha/issues/3699): Fix debug-related Node.js options not working in all cases ([**@boneskull**](https://github.com/boneskull))
+- [#3700](https://github.com/mochajs/mocha/issues/3700): Growl notifications now show the correct number of tests run ([**@outsideris**](https://github.com/outsideris))
+- [#3686](https://github.com/mochajs/mocha/issues/3686): Avoid potential ReDoS when diffing large objects ([**@cyjake**](https://github.com/cyjake))
+- [#3715](https://github.com/mochajs/mocha/issues/3715): Fix incorrect order of emitted events when used programmatically ([**@boneskull**](https://github.com/boneskull))
+- [#3706](https://github.com/mochajs/mocha/issues/3706): Fix regression wherein `--reporter-option`/`--reporter-options` did not support comma-separated key/value pairs ([**@boneskull**](https://github.com/boneskull))
+
+## :book: Documentation
+
+- [#3652](https://github.com/mochajs/mocha/issues/3652): Switch from Jekyll to Eleventy ([**@Munter**](https://github.com/Munter))
+
+## :nut_and_bolt: Other
+
+- [#3677](https://github.com/mochajs/mocha/issues/3677): Add error objects for createUnsupportedError and createInvalidExceptionError ([**@boneskull**](https://github.com/boneskull))
+- [#3733](https://github.com/mochajs/mocha/issues/3733): Removed unnecessary processing in post-processing hook ([**@wanseob**](https://github.com/wanseob))
+- [#3730](https://github.com/mochajs/mocha/issues/3730): Update nyc to latest version ([**@coreyfarrell**](https://github.com/coreyfarrell))
+- [#3648](https://github.com/mochajs/mocha/issues/3648), [#3680](https://github.com/mochajs/mocha/issues/3680): Fixes to support latest versions of [unexpected](https://npm.im/unexpected) and [unexpected-sinon](https://npm.im/unexpected-sinon) ([**@sunesimonsen**](https://github.com/sunesimonsen))
+- [#3638](https://github.com/mochajs/mocha/issues/3638): Add meta tag to site ([**@MartijnCuppens**](https://github.com/MartijnCuppens))
+- [#3653](https://github.com/mochajs/mocha/issues/3653): Fix parts of test suite failing to run on Windows ([**@boneskull**](https://github.com/boneskull))
+
 # 6.0.0-1 / 2019-01-02
 
 ## :bug: Fixes

package/bin/mocha

@@ -9,71 +9,78 @@
  * @private
  */
 
-const {deprecate} = require('../lib/utils');
+const {deprecate, warn} = require('../lib/utils');
 const {spawn} = require('child_process');
 const {loadOptions} = require('../lib/cli/options');
-const {isNodeFlag, impliesNoTimeouts} = require('../lib/cli/node-flags');
+const {
+  unparseNodeFlags,
+  isNodeFlag,
+  impliesNoTimeouts
+} = require('../lib/cli/node-flags');
 const unparse = require('yargs-unparser');
-const debug = require('debug')('mocha:cli');
+const debug = require('debug')('mocha:cli:mocha');
 const {aliases} = require('../lib/cli/run-option-metadata');
+const nodeEnv = require('node-environment-flags');
 
 const mochaPath = require.resolve('./_mocha');
-const childOpts = {};
-const nodeOpts = {};
+const mochaArgs = {};
+const nodeArgs = {};
 
 const opts = loadOptions(process.argv.slice(2));
 debug('loaded opts', opts);
 
+/**
+ * Given option/command `value`, disable timeouts if applicable
+ * @param {string} [value] - Value to check
+ * @ignore
+ */
+const disableTimeouts = value => {
+  if (impliesNoTimeouts(value)) {
+    debug(`option "${value}" disabled timeouts`);
+    mochaArgs.timeout = 0;
+    delete mochaArgs.timeouts;
+    delete mochaArgs.t;
+  }
+};
+
+/**
+ * If `value` begins with `v8-` and is not explicitly `v8-options`, remove prefix
+ * @param {string} [value] - Value to check
+ * @returns {string} `value` with prefix (maybe) removed
+ * @ignore
+ */
+const trimV8Option = value =>
+  value !== 'v8-options' && /^v8-/.test(value) ? value.slice(3) : value;
+
+// sort options into "node" and "mocha" buckets
 Object.keys(opts).forEach(opt => {
   if (isNodeFlag(opt)) {
-    if (/^v8-/.test(opt)) {
-      opt = opt.slice(2);
-    }
-    nodeOpts[opt] = opts[opt];
-    if (impliesNoTimeouts(opt)) {
-      debug(`option "${opt}" disabled timeouts`);
-      childOpts.timeout = false;
-    }
+    nodeArgs[trimV8Option(opt)] = opts[opt];
+    disableTimeouts(opt);
   } else {
-    childOpts[opt] = opts[opt];
+    mochaArgs[opt] = opts[opt];
   }
 });
 
-// allow --debug to invoke --inspect on Node.js v8 or newer  nodeOpts.inspect = childOpts.debug;
-if (childOpts.debug) {
-  childOpts.timeout = false;
-  delete childOpts.debug;
-  debug('--debug -> --inspect');
-} else if (childOpts['debug-brk']) {
-  nodeOpts['inspect-brk'] = childOpts['debug-brk'];
-  childOpts.timeout = false;
-  delete childOpts['debug-brk'];
-  debug('--debug-brk -> --inspect-brk');
-}
-
-// historical
-if (nodeOpts.gc) {
-  deprecate(
-    '"-gc" is deprecated and will be removed from a future version of Mocha.  Use "--gc-global" instead.'
-  );
-  nodeOpts['gc-global'] = nodeOpts.gc;
-  delete nodeOpts.gc;
-}
-
 // Native debugger handling
 // see https://nodejs.org/api/debugger.html#debugger_debugger
 // look for 'debug' or 'inspect' that would launch this debugger,
 // remove it from Mocha's opts and prepend it to Node's opts.
 // also coerce depending on Node.js version.
-if (/^(debug|inspect)$/.test(childOpts._[0])) {
-  childOpts.timeout = false;
-  childOpts._.shift();
+// A deprecation warning will be printed by node, if applicable.
+// (mochaArgs._ are "positional" arguments, not prefixed with - or --)
+if (/^(debug|inspect)$/.test(mochaArgs._[0])) {
+  const command = mochaArgs._.shift();
+  disableTimeouts(command);
   // don't conflict with inspector
-  delete nodeOpts['debug'];
-  delete nodeOpts['inspect'];
-  delete nodeOpts['debug-brk'];
-  delete nodeOpts['inspect-brk'];
-  nodeOpts._ = [
+  ['debug', 'inspect', 'debug-brk', 'inspect-brk']
+    .filter(opt => opt in nodeArgs || opt in mochaArgs)
+    .forEach(opt => {
+      warn(`command "${command}" provided; --${opt} ignored`);
+      delete nodeArgs[opt];
+      delete mochaArgs[opt];
+    });
+  nodeArgs._ = [
     parseInt(
       process.version
         .slice(1)
@@ -86,10 +93,37 @@ if (/^(debug|inspect)$/.test(childOpts._[0])) {
   ];
 }
 
+// allow --debug to invoke --inspect on Node.js v8 or newer.
+['debug', 'debug-brk']
+  .filter(opt => opt in nodeArgs && !nodeEnv.has(opt))
+  .forEach(opt => {
+    const newOpt = opt === 'debug' ? 'inspect' : 'inspect-brk';
+    warn(
+      `"--${opt}" is not available in Node.js ${
+        process.version
+      }; use "--${newOpt}" instead.`
+    );
+    nodeArgs[newOpt] = nodeArgs[opt];
+    mochaArgs.timeout = false;
+    debug(`--${opt} -> ${newOpt}`);
+    delete nodeArgs[opt];
+  });
+
+// historical
+if (nodeArgs.gc) {
+  deprecate(
+    '"-gc" is deprecated and will be removed from a future version of Mocha.  Use "--gc-global" instead.'
+  );
+  nodeArgs['gc-global'] = nodeArgs.gc;
+  delete nodeArgs.gc;
+}
+
+debug('final node args', nodeArgs);
+
 const args = [].concat(
-  unparse(nodeOpts),
+  unparseNodeFlags(nodeArgs),
   mochaPath,
-  unparse(childOpts, {alias: aliases})
+  unparse(mochaArgs, {alias: aliases})
 );
 
 debug(`exec ${process.execPath} w/ args:`, args);

package/lib/browser/growl.js

@@ -10,6 +10,7 @@
  */
 var Date = global.Date;
 var setTimeout = global.setTimeout;
+var EVENT_RUN_END = require('../runner').constants.EVENT_RUN_END;
 
 /**
  * Checks if browser notification support exists.
@@ -53,7 +54,7 @@ exports.notify = function(runner) {
       .catch(notPermitted);
   };
 
-  runner.once('end', sendNotification);
+  runner.once(EVENT_RUN_END, sendNotification);
 };
 
 /**
@@ -129,7 +130,7 @@ function display(runner) {
   var title;
 
   if (stats.failures) {
-    _message = stats.failures + ' of ' + runner.total + ' tests failed';
+    _message = stats.failures + ' of ' + stats.tests + ' tests failed';
     message = symbol.cross + ' ' + _message;
     title = 'Failed';
   } else {

package/lib/cli/node-flags.js

@@ -7,6 +7,7 @@
  */
 
 const nodeFlags = require('node-environment-flags');
+const unparse = require('yargs-unparser');
 
 /**
  * These flags are considered "debug" flags.
@@ -34,6 +35,7 @@ const debugFlags = new Set(['debug', 'debug-brk', 'inspect', 'inspect-brk']);
 exports.isNodeFlag = flag =>
   !/^(?:require|r)$/.test(flag) &&
   (nodeFlags.has(flag) ||
+    debugFlags.has(flag) ||
     /(?:preserve-symlinks(?:-main)?|harmony(?:[_-]|$)|(?:trace[_-].+$)|gc(?:[_-]global)?$|es[_-]staging$|use[_-]strict$|v8[_-](?!options).+?$)/.test(
       flag
     ));
@@ -46,3 +48,22 @@ exports.isNodeFlag = flag =>
  * @private
  */
 exports.impliesNoTimeouts = flag => debugFlags.has(flag);
+
+/**
+ * All non-strictly-boolean arguments to node--those with values--must specify those values using `=`, e.g., `--inspect=0.0.0.0`.
+ * Unparse these arguments using `yargs-unparser` (which would result in `--inspect 0.0.0.0`), then supply `=` where we have values.
+ * There's probably an easier or more robust way to do this; fixes welcome
+ * @param {Object} opts - Arguments object
+ * @returns {string[]} Unparsed arguments using `=` to specify values
+ * @private
+ */
+exports.unparseNodeFlags = opts => {
+  var args = unparse(opts);
+  return args.length
+    ? args
+        .join(' ')
+        .split(/\b/)
+        .map(arg => (arg === ' ' ? '=' : arg))
+        .join('')
+    : [];
+};

package/lib/cli/options.js

@@ -17,6 +17,8 @@ const {loadConfig, findConfig} = require('./config');
 const findup = require('findup-sync');
 const {deprecate} = require('../utils');
 const debug = require('debug')('mocha:cli:options');
+const {createMissingArgumentError} = require('../errors');
+const {isNodeFlag} = require('./node-flags');
 
 /**
  * The `yargs-parser` namespace
@@ -73,21 +75,50 @@ const nargOpts = types.array
  * @private
  * @ignore
  */
-const parse = (args = [], ...configObjects) =>
-  yargsParser(
-    args,
-    Object.assign(
-      {
-        configuration,
-        configObjects,
-        coerce: coerceOpts,
-        narg: nargOpts,
-        alias: aliases
-      },
-      types
-    )
+const parse = (args = [], ...configObjects) => {
+  // save node-specific args for special handling.
+  // 1. when these args have a "=" they should be considered to have values
+  // 2. if they don't, they just boolean flags
+  // 3. to avoid explicitly defining the set of them, we tell yargs-parser they
+  //    are ALL boolean flags.
+  // 4. we can then reapply the values after yargs-parser is done.
+  const nodeArgs = (Array.isArray(args) ? args : args.split(' ')).reduce(
+    (acc, arg) => {
+      const pair = arg.split('=');
+      const flag = pair[0].replace(/^--?/, '');
+      if (isNodeFlag(flag)) {
+        return arg.includes('=')
+          ? acc.concat([[flag, pair[1]]])
+          : acc.concat([[flag, true]]);
+      }
+      return acc;
+    },
+    []
   );
 
+  const result = yargsParser.detailed(args, {
+    configuration,
+    configObjects,
+    coerce: coerceOpts,
+    narg: nargOpts,
+    alias: aliases,
+    string: types.string,
+    array: types.array,
+    number: types.number,
+    boolean: types.boolean.concat(nodeArgs.map(pair => pair[0]))
+  });
+  if (result.error) {
+    throw createMissingArgumentError(result.error.message);
+  }
+
+  // reapply "=" arg values from above
+  nodeArgs.forEach(([key, value]) => {
+    result.argv[key] = value;
+  });
+
+  return result.argv;
+};
+
 /**
  * - Replaces comments with empty strings
  * - Replaces escaped spaces (e.g., 'xxx\ yyy') with HTML space

package/lib/cli/run-helpers.js

@@ -8,13 +8,13 @@
  */
 
 const fs = require('fs');
+const path = require('path');
+const ansi = require('ansi-colors');
 const debug = require('debug')('mocha:cli:run:helpers');
+const minimatch = require('minimatch');
 const Context = require('../context');
-const path = require('path');
+const Mocha = require('../mocha');
 const utils = require('../utils');
-const minimatch = require('minimatch');
-const ansi = require('ansi-colors');
-const symbols = require('log-symbols');
 
 const cwd = (exports.cwd = process.cwd());
 
@@ -26,7 +26,7 @@ const cwd = (exports.cwd = process.cwd());
  */
 const exitMochaLater = code => {
   process.on('exit', () => {
-    process.exit(Math.min(code, 255));
+    process.exitCode = Math.min(code, 255);
   });
 };
 
@@ -138,13 +138,14 @@ exports.handleFiles = ({
   spec = []
 } = {}) => {
   let files = [];
+  const unmatched = [];
   spec.forEach(arg => {
     let newFiles;
     try {
       newFiles = utils.lookupFiles(arg, extension, recursive);
     } catch (err) {
       if (err.code === 'ERR_MOCHA_NO_FILES_MATCH_PATTERN') {
-        console.warn('Warning: %s: %O', err.message, err.pattern);
+        unmatched.push({message: err.message, pattern: err.pattern});
         return;
       }
 
@@ -164,8 +165,18 @@ exports.handleFiles = ({
   });
 
   if (!files.length) {
-    console.error(ansi.red(`${symbols.error} No test files found`));
+    // give full message details when only 1 file is missing
+    const noneFoundMsg =
+      unmatched.length === 1
+        ? `Error: No test files found: ${JSON.stringify(unmatched[0].pattern)}` // stringify to print escaped characters raw
+        : 'Error: No test files found';
+    console.error(ansi.red(noneFoundMsg));
     process.exit(1);
+  } else {
+    // print messages as an warning
+    unmatched.forEach(warning => {
+      console.warn(ansi.yellow(`Warning: ${warning.message}`));
+    });
   }
 
   const fileArgs = file.map(filepath => path.resolve(filepath));
@@ -239,9 +250,7 @@ exports.watchRun = (
   };
 
   const purge = () => {
-    watchFiles.forEach(file => {
-      delete require.cache[file];
-    });
+    watchFiles.forEach(Mocha.unloadFile);
   };
 
   loadAndRun();

package/lib/cli/run-option-metadata.js

@@ -28,6 +28,7 @@ exports.types = {
     'bail',
     'check-leaks',
     'color',
+    'delay',
     'diff',
     'exit',
     'forbid-only',
@@ -35,9 +36,12 @@ exports.types = {
     'full-trace',
     'growl',
     'inline-diffs',
+    'interfaces',
     'invert',
     'no-colors',
     'recursive',
+    'reporters',
+    'sort',
     'watch'
   ],
   number: ['retries', 'slow', 'timeout'],

package/lib/cli/run.js

@@ -8,9 +8,11 @@
  */
 
 const Mocha = require('../mocha');
-const ansi = require('ansi-colors');
-const errors = require('../errors');
-const createInvalidArgumentValueError = errors.createInvalidArgumentValueError;
+const {
+  createUnsupportedError,
+  createInvalidArgumentValueError,
+  createMissingArgumentError
+} = require('../errors');
 
 const {
   list,
@@ -188,7 +190,7 @@ exports.builder = yargs =>
       },
       'reporter-option': {
         coerce: opts =>
-          opts.reduce((acc, opt) => {
+          list(opts).reduce((acc, opt) => {
             const pair = opt.split('=');
 
             if (pair.length > 2 || !pair.length) {
@@ -258,15 +260,17 @@ exports.builder = yargs =>
 
       // yargs.implies() isn't flexible enough to handle this
       if (argv.invert && !('fgrep' in argv || 'grep' in argv)) {
-        throw new Error(
-          '"--invert" requires one of "--fgrep <str>" or "--grep <regexp>"'
+        throw createMissingArgumentError(
+          '"--invert" requires one of "--fgrep <str>" or "--grep <regexp>"',
+          '--fgrep|--grep',
+          'string|regexp'
         );
       }
 
       if (argv.compilers) {
-        throw new Error(
+        throw createUnsupportedError(
           `--compilers is DEPRECATED and no longer supported.
-          See ${ansi.cyan('https://git.io/vdcSr')} for migration information.`
+          See https://git.io/vdcSr for migration information.`
         );
       }
 

package/lib/errors.js

@@ -7,7 +7,7 @@
  */
 
 /**
- * Creates an error object used when no files to be tested could be found using specified pattern.
+ * Creates an error object to be thrown when no files to be tested could be found using specified pattern.
  *
  * @public
  * @param {string} message - Error message to be displayed.
@@ -22,7 +22,7 @@ function createNoFilesMatchPatternError(message, pattern) {
 }
 
 /**
- * Creates an error object used when the reporter specified in the options was not found.
+ * Creates an error object to be thrown when the reporter specified in the options was not found.
  *
  * @public
  * @param {string} message - Error message to be displayed.
@@ -37,7 +37,7 @@ function createInvalidReporterError(message, reporter) {
 }
 
 /**
- * Creates an error object used when the interface specified in the options was not found.
+ * Creates an error object to be thrown when the interface specified in the options was not found.
  *
  * @public
  * @param {string} message - Error message to be displayed.
@@ -52,20 +52,20 @@ function createInvalidInterfaceError(message, ui) {
 }
 
 /**
- * Creates an error object used when the type of output specified was not supported.
+ * Creates an error object to be thrown when a behavior, option, or parameter is unsupported.
  *
  * @public
  * @param {string} message - Error message to be displayed.
  * @returns {Error} instance detailing the error condition
  */
-function createNotSupportedError(message) {
+function createUnsupportedError(message) {
   var err = new Error(message);
-  err.code = 'ERR_MOCHA_NOT_SUPPORTED';
+  err.code = 'ERR_MOCHA_UNSUPPORTED';
   return err;
 }
 
 /**
- * Creates an error object used when an argument is missing.
+ * Creates an error object to be thrown when an argument is missing.
  *
  * @public
  * @param {string} message - Error message to be displayed.
@@ -78,7 +78,7 @@ function createMissingArgumentError(message, argument, expected) {
 }
 
 /**
- * Creates an error object used when an argument did not use the supported type
+ * Creates an error object to be thrown when an argument did not use the supported type
  *
  * @public
  * @param {string} message - Error message to be displayed.
@@ -96,7 +96,7 @@ function createInvalidArgumentTypeError(message, argument, expected) {
 }
 
 /**
- * Creates an error object used when an argument did not use the supported value
+ * Creates an error object to be thrown when an argument did not use the supported value
  *
  * @public
  * @param {string} message - Error message to be displayed.
@@ -115,25 +115,27 @@ function createInvalidArgumentValueError(message, argument, value, reason) {
 }
 
 /**
- * Creates an error object used when an error was thrown but no details were specified.
+ * Creates an error object to be thrown when an exception was caught, but the `Error` is falsy or undefined.
  *
  * @public
  * @param {string} message - Error message to be displayed.
  * @returns {Error} instance detailing the error condition
  */
-function createUndefinedError(message) {
+function createInvalidExceptionError(message, value) {
   var err = new Error(message);
-  err.code = 'ERR_MOCHA_UNDEFINED_ERROR';
+  err.code = 'ERR_MOCHA_INVALID_EXCEPTION';
+  err.valueType = typeof value;
+  err.value = value;
   return err;
 }
 
 module.exports = {
   createInvalidArgumentTypeError: createInvalidArgumentTypeError,
   createInvalidArgumentValueError: createInvalidArgumentValueError,
+  createInvalidExceptionError: createInvalidExceptionError,
   createInvalidInterfaceError: createInvalidInterfaceError,
   createInvalidReporterError: createInvalidReporterError,
   createMissingArgumentError: createMissingArgumentError,
   createNoFilesMatchPatternError: createNoFilesMatchPatternError,
-  createNotSupportedError: createNotSupportedError,
-  createUndefinedError: createUndefinedError
+  createUnsupportedError: createUnsupportedError
 };

package/lib/growl.js

@@ -8,6 +8,7 @@
 const os = require('os');
 const path = require('path');
 const {sync: which} = require('which');
+const {EVENT_RUN_END} = require('./runner').constants;
 
 /**
  * @summary
@@ -41,7 +42,7 @@ exports.isCapable = () => {
  * @param {Runner} runner - Runner instance.
  */
 exports.notify = runner => {
-  runner.once('end', () => {
+  runner.once(EVENT_RUN_END, () => {
     display(runner);
   });
 };
@@ -64,7 +65,7 @@ const display = runner => {
   let title;
 
   if (stats.failures) {
-    _message = `${stats.failures} of ${runner.total} tests failed`;
+    _message = `${stats.failures} of ${stats.tests} tests failed`;
     message = `${symbol.cross} ${_message}`;
     title = 'Failed';
   } else {

package/lib/interfaces/bdd.js

@@ -1,6 +1,8 @@
 'use strict';
 
 var Test = require('../test');
+var EVENT_FILE_PRE_REQUIRE = require('../suite').constants
+  .EVENT_FILE_PRE_REQUIRE;
 
 /**
  * BDD-style interface:
@@ -22,7 +24,7 @@ var Test = require('../test');
 module.exports = function bddInterface(suite) {
   var suites = [suite];
 
-  suite.on('pre-require', function(context, file, mocha) {
+  suite.on(EVENT_FILE_PRE_REQUIRE, function(context, file, mocha) {
     var common = require('./common')(suites, context, mocha);
 
     context.before = common.before;

package/lib/interfaces/common.js

@@ -130,7 +130,7 @@ module.exports = function(suites, context, mocha) {
             throw new Error('`.only` forbidden');
           }
 
-          suite.parent._onlySuites = suite.parent._onlySuites.concat(suite);
+          suite.parent.appendOnlySuite(suite);
         }
         if (suite.pending) {
           if (mocha.options.forbidPending && shouldBeTested(suite)) {
@@ -141,10 +141,11 @@ module.exports = function(suites, context, mocha) {
           var result = opts.fn.call(suite);
           if (typeof result !== 'undefined') {
             utils.deprecate(
-              'Deprecation Warning: Suites do not support a return value;' +
-                opts.title +
-                ' returned :' +
-                result
+              'Suites ignore return values. Suite "' +
+                suite.fullTitle() +
+                '" in ' +
+                suite.file +
+                ' returned a value; this may be a bug in your test code'
             );
           }
           suites.shift();
@@ -174,7 +175,7 @@ module.exports = function(suites, context, mocha) {
        * @returns {*}
        */
       only: function(mocha, test) {
-        test.parent._onlyTests = test.parent._onlyTests.concat(test);
+        test.parent.appendOnlyTest(test);
         return test;
       },
 

package/lib/interfaces/exports.js

@@ -22,7 +22,7 @@ var Test = require('../test');
 module.exports = function(suite) {
   var suites = [suite];
 
-  suite.on('require', visit);
+  suite.on(Suite.constants.EVENT_FILE_REQUIRE, visit);
 
   function visit(obj, file) {
     var suite;