Merge cdcc756 into b269ad0

mochajs · Aug 1, 2019 · ce37b7a · ce37b7a
2 parents b269ad0 + cdcc756
commit ce37b7a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/lib/cli/options.js b/lib/cli/options.js
@@ -230,6 +230,9 @@ const loadMochaOpts = (args = {}) => {
   // if there's an exception to catch here, I'm not sure what it is.
   // by attaching the `no-opts` arg, we avoid re-parsing of `mocha.opts`.
   if (mochaOpts) {
+    deprecate(
+      'Configuration via mocha.opts is DEPRECATED and will be removed from a future version of Mocha. Use RC files or package.json instead.'
+    );
     result = parse(parseMochaOpts(mochaOpts));
     debug(`${filepath} parsed succesfully`);
   }

diff --git a/lib/cli/run.js b/lib/cli/run.js
@@ -162,7 +162,7 @@ exports.builder = yargs =>
       },
       opts: {
         default: defaults.opts,
-        description: 'Path to `mocha.opts`',
+        description: 'Path to `mocha.opts` (DEPRECATED)',
         group: GROUPS.CONFIG,
         normalize: true,
         requiresArg: true

diff --git a/test/integration/options/opts.spec.js b/test/integration/options/opts.spec.js
@@ -10,6 +10,24 @@ describe('--opts', function() {
   var args = [];
   var fixture = path.join('options', 'opts');
 
+  it('should print a deprecation warning', function(done) {
+    var mochaOpts = path.join('test', 'opts', 'mocha.opts');
+    args = [resolvePath(fixture), '--opts', mochaOpts];
+    invokeMocha(
+      args,
+      function(err, res) {
+        if (err) {
+          return done(err);
+        }
+
+        expect(res, 'to have passed');
+        expect(res.output, 'to contain', 'mocha.opts is DEPRECATED');
+        done();
+      },
+      'pipe'
+    );
+  });
+
   it('should work despite nonexistent default options file', function(done) {
     args = [];
     runMochaJSON(fixture, args, function(err, res) {