assorted test fixes & refactors

.mocharc.yml

@@ -1,7 +1,14 @@
-require: test/setup
-ui: bdd
+require: 'test/setup'
+ui: 'bdd'
 global:
-  - okGlobalA,okGlobalB
-  - okGlobalC
-  - callback*
-timeout: 300
+  - 'okGlobalA,okGlobalB'
+  - 'okGlobalC'
+  - 'callback*'
+timeout: 1000
+watch-ignore:
+  - '.*'
+  - 'docs/_dist/**'
+  - 'docs/_site/**'
+  - 'node_modules'
+  - 'coverage'
+  - 'cache'

example/config/.mocharc.yml

@@ -8,39 +8,39 @@ delay: false
 diff: true
 exit: false # could be expressed as "no-exit: true"
 extension:
-  - js
+  - 'js'
 # fgrep and grep are mutually exclusive
 # fgrep: something
 file:
-  - /path/to/some/file
-  - /path/to/some/other/file
+  - '/path/to/some/file'
+  - '/path/to/some/other/file'
 forbid-only: false
 forbid-pending: false
 full-trace: false
 global:
-  - jQuery
-  - $
+  - 'jQuery'
+  - '$'
 # fgrep and grep are mutually exclusive
 # grep: something
 growl: false
 ignore:
-  - /path/to/some/ignored/file
+  - '/path/to/some/ignored/file'
 inline-diffs: false
 # needs to be used with grep or fgrep
 # invert: false
 recursive: false
-reporter: spec
+reporter: 'spec'
 reporter-option:
-  - foo=bar
-  - baz=quux
+  - 'foo=bar'
+  - 'baz=quux'
 require: '@babel/register'
 retries: 1
 slow: 75
 sort: false
-spec: test/**/*.spec.js # the positional arguments!
+spec: 'test/**/*.spec.js' # the positional arguments!
 timeout: false # same as "no-timeout: true" or "timeout: 0"
 trace-warnings: true # node flags ok
-ui: bdd
+ui: 'bdd'
 v8-stack-trace-limit: 100 # V8 flags are prepended with "v8-"
 watch: false
 watch-files:

lib/mocha.js

@@ -388,7 +388,9 @@ Mocha.unloadFile = function(file) {
  * @chainable
  */
 Mocha.prototype.unloadFiles = function() {
-  this.files.forEach(Mocha.unloadFile);
+  this.files.forEach(function(file) {
+    Mocha.unloadFile(file);
+  });
   return this;
 };
 

test/integration/diffs.spec.js

@@ -72,7 +72,7 @@ describe('diffs', function() {
   var diffs, expected;
 
   before(function(done) {
-    run('diffs/diffs.fixture.js', ['-C'], function(err, res) {
+    run('diffs/diffs.fixture.js', [], function(err, res) {
       if (err) {
         done(err);
         return;

test/integration/fixtures/uncaught/listeners.fixture.js

@@ -3,7 +3,8 @@
 const assert = require('assert');
 const mocha = require("../../../../lib/mocha");
 
-for (let i = 0; i < 15; i++) {
+// keep this low to avoid warning
+for (let i = 0; i < 5; i++) {
   const r = new mocha.Runner(new mocha.Suite("" + i, undefined));
   r.run();
 }