Merge pull request #2 from Lana-Light/patch-4

Patch 4

.eslintrc.yml

@@ -9,7 +9,6 @@ parserOptions:
   ecmaVersion: 5
   ecmaFeatures:
     globalReturn: no
-    experimentalObjectRestSpread: no
     jsx: no
   sourceType: script
 rules:
@@ -18,30 +17,61 @@ rules:
     - safe
 overrides:
   - files:
-    - scripts/**/*.js
-    - package-scripts.js
-    - karma.conf.js
-    - .wallaby.js
-    - bin/*
-    - lib/cli/**/*.js
-    - test/node-unit/**/*.js
+      - scripts/**/*.js
+      - package-scripts.js
+      - karma.conf.js
+      - .wallaby.js
+      - bin/*
+      - lib/cli/**/*.js
+      - test/node-unit/**/*.js
     parserOptions:
       ecmaVersion: 6
     env:
       browser: no
+
   - files:
-    - test/**/*.{js,mjs}
+      - test/**/*.{js,mjs}
     env:
       mocha: yes
     globals:
       expect: no
   - files:
-    - doc/**/*.js
-    env:
-      node: no
+    - bin/*
+    - lib/**/*.js
+    rules:
+      no-restricted-globals:
+        - error
+        - name: setTimeout
+          message: &GH-237 See https://github.com/mochajs/mocha/issues/237
+        - name: clearTimeout
+          message: *GH-237
+        - name: setInterval
+          message: *GH-237
+        - name: clearInterval
+          message: *GH-237
+        - name: setImmediate
+          message: *GH-237
+        - name: clearImmediate
+          message: *GH-237
+        - name: Date
+          message: *GH-237
+      no-restricted-modules:
+        - error
+        - timers
+      no-restricted-syntax:
+        - error
+        # disallow `global.setTimeout()`, `global.setInterval()`, etc.
+        - selector: 'CallExpression[callee.object.name=global][callee.property.name=/(set|clear)(Timeout|Immediate|Interval)/]'
+          message: *GH-237
+        # disallow `new global.Date()`
+        - selector: 'NewExpression[callee.object.name=global][callee.property.name=Date]'
+          message: *GH-237
+        # disallow property access of `global.<timer>.*`
+        - selector: '*[object.object.name=global][object.property.name=/(Date|(set|clear)(Timeout|Immediate|Interval))/]:expression'
+          message: *GH-237
+
   - files:
-    - test/**/*.mjs
+      - test/**/*.mjs
     parserOptions:
       ecmaVersion: 6
       sourceType: module
-

.lintstagedrc.json

@@ -1,6 +1,7 @@
 {
   "linters": {
-    "(bin/*|*.{js,json}|**/*.{js,json})": ["prettier-eslint --write", "git add"]
+    "(bin/*|*.js|**/*.js)": ["eslint --fix", "git add"],
+    "(*.{json,yml}|**/*.{json,yml})": ["prettier --write", "git add"]
   },
   "ignore": ["docs/**/*.js", "test/**/*.fixture.js", "package*.json"]
 }

.travis.yml

@@ -15,7 +15,7 @@ node_js: '11'
 addons:
   apt:
     packages:
-    - libnotify-bin
+      - libnotify-bin
 # `nvm install` happens before the cache is restored, which means
 # we must install our own npm elsewhere (`~/npm`)
 before_install: |

docs/index.md

@@ -909,7 +909,7 @@ Enforce a rule that tests must be written in "async" style, meaning each test pr
 
 ### `--bail, -b`
 
-Causes Mocha to stop running tests after the first test failure it encounters.
+Causes Mocha to stop running tests after the first test failure it encounters. Corresponding `after()` and `afterEach()` hooks are executed for potential cleanup.
 
 `--bail` does *not* imply `--exit`.
 

karma.conf.js

@@ -31,8 +31,7 @@ module.exports = config => {
     browserify: {
       debug: true,
       configure: function configure(b) {
-        b
-          .ignore('glob')
+        b.ignore('glob')
           .ignore('fs')
           .ignore('path')
           .ignore('supports-color')

lib/reporters/base.js

@@ -18,19 +18,6 @@ var supportsColor = process.browser ? null : require('supports-color');
 
 exports = module.exports = Base;
 
-/**
- * Save timer references to avoid Sinon interfering.
- * See: https://github.com/mochajs/mocha/issues/237
- */
-
-/* eslint-disable no-unused-vars, no-native-reassign */
-var Date = global.Date;
-var setTimeout = global.setTimeout;
-var setInterval = global.setInterval;
-var clearTimeout = global.clearTimeout;
-var clearInterval = global.clearInterval;
-/* eslint-enable no-unused-vars, no-native-reassign */
-
 /**
  * Check if both stdio streams are associated with a tty.
  */

lib/reporters/html.js

@@ -18,13 +18,7 @@ var escape = utils.escape;
  * Save timer references to avoid Sinon interfering (see GH-237).
  */
 
-/* eslint-disable no-unused-vars, no-native-reassign */
 var Date = global.Date;
-var setTimeout = global.setTimeout;
-var setInterval = global.setInterval;
-var clearTimeout = global.clearTimeout;
-var clearInterval = global.clearInterval;
-/* eslint-enable no-unused-vars, no-native-reassign */
 
 /**
  * Expose `HTML`.
@@ -232,7 +226,7 @@ function HTML(runner) {
 
   function updateStats() {
     // TODO: add to stats
-    var percent = (stats.tests / runner.total * 100) | 0;
+    var percent = ((stats.tests / runner.total) * 100) | 0;
     if (progress) {
       progress.update(percent).draw(ctx);
     }

lib/reporters/landing.js

@@ -67,7 +67,7 @@ function Landing(runner) {
 
   runner.on('test end', function(test) {
     // check if the plane crashed
-    var col = crashed === -1 ? (width * ++n / total) | 0 : crashed;
+    var col = crashed === -1 ? ((width * ++n) / total) | 0 : crashed;
 
     // show the crash
     if (test.state === 'failed') {

lib/reporters/xunit.js

@@ -17,14 +17,7 @@ var path = require('path');
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
  */
-
-/* eslint-disable no-unused-vars, no-native-reassign */
 var Date = global.Date;
-var setTimeout = global.setTimeout;
-var setInterval = global.setInterval;
-var clearTimeout = global.clearTimeout;
-var clearInterval = global.clearInterval;
-/* eslint-enable no-unused-vars, no-native-reassign */
 
 /**
  * Expose `XUnit`.

lib/runnable.js

@@ -8,15 +8,9 @@ var utils = require('./utils');
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
  */
-
-/* eslint-disable no-unused-vars, no-native-reassign */
 var Date = global.Date;
 var setTimeout = global.setTimeout;
-var setInterval = global.setInterval;
 var clearTimeout = global.clearTimeout;
-var clearInterval = global.clearInterval;
-/* eslint-enable no-unused-vars, no-native-reassign */
-
 var toString = Object.prototype.toString;
 
 module.exports = Runnable;

lib/runner.js

@@ -241,16 +241,14 @@ Runner.prototype.fail = function(test, err) {
   }
 
   this.emit('fail', test, err);
-  if (this.suite.bail()) {
-    this.emit('end');
-  }
 };
 
 /**
  * Fail the given `hook` with `err`.
  *
  * Hook failures work in the following pattern:
- * - If bail, then exit
+ * - If bail, run corresponding `after each` and `after` hooks,
+ *   then exit
  * - Failed `before` hook skips all tests in a suite and subsuites,
  *   but jumps to corresponding `after` hook
  * - Failed `before each` hook skips remaining tests in a
@@ -494,7 +492,7 @@ Runner.prototype.runTests = function(suite, fn) {
   function next(err, errSuite) {
     // if we bail after first err
     if (self.failures && suite._bail) {
-      return fn();
+      tests = [];
     }
 
     if (self._abort) {
@@ -710,9 +708,9 @@ Runner.prototype.uncaught = function(err) {
     debug(
       'uncaught exception %s',
       err ===
-      function() {
-        return this;
-      }.call(err)
+        function() {
+          return this;
+        }.call(err)
         ? err.message || err
         : err
     );

lib/stats-collector.js

@@ -21,6 +21,8 @@
  * @property {number} duration - number of msecs that testing took.
  */
 
+var Date = global.Date;
+
 /**
  * Provides stats such as test duration, number of tests passed / failed etc., by listening for events emitted by `runner`.
  *

lib/utils.js

@@ -91,8 +91,7 @@ exports.files = function(dir, ext, ret) {
 
   var re = new RegExp('\\.(' + ext.join('|') + ')$');
 
-  fs
-    .readdirSync(dir)
+  fs.readdirSync(dir)
     .filter(ignored)
     .forEach(function(path) {
       path = join(dir, path);