From a9745f100322114fbe8f73e77a678be4e45a0ed4 Mon Sep 17 00:00:00 2001
From: Paul Roebuck <plroebuck@users.noreply.github.com>
Date: Thu, 3 May 2018 17:10:22 -0500
Subject: [PATCH] feat(bin/options.js): Add support for comment lines in
 "mocha.opts"

Modified code to strip comment lines, those beginning with a hash character ('#'), from "mocha.opts"
prior to processing its contents.

Fixes #3370
---
 bin/options.js                      | 1 +
 test/integration/regression.spec.js | 1 +
 test/mocha.opts                     | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/bin/options.js b/bin/options.js
index 60cbcd705e..a25a18e28e 100644
--- a/bin/options.js
+++ b/bin/options.js
@@ -32,6 +32,7 @@ function getOptions() {
   try {
     const opts = fs
       .readFileSync(optsPath, 'utf8')
+      .replace(/^#.*$/gm, '')
       .replace(/\\\s/g, '%20')
       .split(/\s/)
       .filter(Boolean)
diff --git a/test/integration/regression.spec.js b/test/integration/regression.spec.js
index e1f6b19dde..92f2223c7a 100644
--- a/test/integration/regression.spec.js
+++ b/test/integration/regression.spec.js
@@ -32,6 +32,7 @@ describe('regressions', function() {
     var processArgv = process.argv.join('');
     var mochaOpts = fs
       .readFileSync(path.join(__dirname, '..', 'mocha.opts'), 'utf-8')
+      .replace(/^#.*$/gm, '')
       .split(/[\s]+/)
       .join('');
     assert.notEqual(
diff --git a/test/mocha.opts b/test/mocha.opts
index c233b95260..c6f308ee28 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,6 +1,11 @@
+###
+### mocha.opts
+###
+
 --require ./test/setup
 --ui bdd
 --globals okGlobalA,okGlobalB
 --globals okGlobalC
 --globals callback*
 --timeout 200
+