fixup! Deconstruct and normalize CLI options in one place

lib/cli/collect-files.js

@@ -6,6 +6,14 @@ const debug = require('debug')('mocha:cli:run:helpers');
 const minimatch = require('minimatch');
 const utils = require('../utils');
 
+/**
+ * Exports a function that collects test files from CLI parameters.
+ * @see module:lib/cli/run-helpers
+ * @see module:lib/cli/watch-run
+ * @module
+ * @private
+ */
+
 /**
  * Smash together an array of test files in the correct order
  * @param {Object} opts - Options

lib/cli/run-helpers.js

@@ -92,7 +92,7 @@ exports.handleRequires = (requires = []) => {
 };
 
 /**
- * Give Mocha files and tell it to run
+ * Collect test files and run mocha instance.
  * @param {Mocha} mocha - Mocha instance
  * @param {Options} [opts] - Command line options
  * @param {boolean} [opts.exit] - Whether or not to force-exit after tests are complete

lib/cli/watch-run.js

@@ -23,7 +23,7 @@ const collectFiles = require('./collect-files');
  * @param {string[]} fileCollectParams.extension - List of extensions to watch
  * @private
  */
-module.exports = (mocha, options, fileCollectParams) => {
+module.exports = (mocha, {grep, ui}, fileCollectParams) => {
   let runner;
   const files = collectFiles(fileCollectParams);
 
@@ -64,12 +64,12 @@ module.exports = (mocha, options, fileCollectParams) => {
   const rerun = () => {
     purge();
     eraseLine();
-    if (!options.grep) {
+    if (!grep) {
       mocha.grep(null);
     }
     mocha.suite = mocha.suite.clone();
     mocha.suite.ctx = new Context();
-    mocha.ui(options.ui);
+    mocha.ui(ui);
     loadAndRun();
   };