Merge branch 'master' into master

.eslintrc.yml

@@ -1,15 +1,40 @@
 root: true
-extends: semistandard
+extends:
+  - semistandard
+  - plugin:prettier/recommended
 env:
   node: yes
   browser: yes
-  es6: no
 parserOptions:
+  ecmaVersion: 5
+  ecmaFeatures:
+    globalReturn: no
+    experimentalObjectRestSpread: no
+    jsx: no
   sourceType: script
 rules:
   strict:
     - error
     - safe
-  linebreak-style:
-    - error
-    - unix
+overrides:
+  - files:
+    - scripts/**/*.js
+    - package-scripts.js
+    - karma.conf.js
+    - .wallaby.js
+    - bin/*
+    parserOptions:
+      ecmaVersion: 6
+    env:
+      browser: no
+  - files:
+    - test/**/*.js
+    env:
+      mocha: yes
+    globals:
+      expect: no
+  - files:
+    - doc/**/*.js
+    env:
+      node: no
+

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -21,5 +21,5 @@ yarn.lock
 *_REMOTE_*
 docs/_site
 docs/_dist
+docs/api
 .vscode/
-

.lintstagedrc.json

@@ -0,0 +1,12 @@
+{
+  "linters": {
+    "(bin/*|**/*.js)": [
+      "prettier-eslint --write",
+      "git add"
+    ]
+  },
+  "ignore": [
+    "docs/**/*.js",
+    "test/**/*.fixture.js"
+  ]
+}

.travis.yml

@@ -7,13 +7,13 @@ stages:
 
 # defaults
 language: node_js
-node_js: '9'
+node_js: '10'
 # `nvm install` happens before the cache is restored, which means
 # we must install our own npm elsewhere (`~/npm`)
 before_install: |
   [[ ! -x ~/npm/node_modules/.bin/npm ]] && {
     # caching feature creates `~/npm` for us
-    cd ~/npm && npm install npm
+    cd ~/npm && npm install npm@^5
     cd -
   } || true
   # avoids bugs around https://github.com/travis-ci/travis-ci/issues/5092
@@ -32,13 +32,13 @@ jobs:
 
     - &node
       script: npm start test.node
-      node_js: '8'
+      node_js: '9'
 
     - <<: *node
-      node_js: '6'
+      node_js: '8'
 
     - <<: *node
-      node_js: '4'
+      node_js: '6'
 
     - script: npm start test.bundle test.browser
       install: npm ci # we need the native modules here
@@ -67,13 +67,13 @@ jobs:
           - node_modules # npm install, unlike npm ci, doesn't wipe node_modules
 
     - <<: *smoke
-      node_js: '8'
+      node_js: '9'
 
     - <<: *smoke
-      node_js: '6'
+      node_js: '8'
 
     - <<: *smoke
-      node_js: '4'
+      node_js: '6'
 
     - stage: precache
       script: true

.wallaby.js

@@ -3,7 +3,7 @@
 module.exports = () => {
   return {
     files: [
-      'index.js', 'lib/**/*.js', 'test/setup.js',
+      'index.js', 'lib/**/*.js', 'test/setup.js', 'test/assertions.js',
       {
         pattern: 'test/node-unit/**/*.fixture.js',
         instrument: false

CHANGELOG.md

@@ -1,3 +1,78 @@
+# 5.2.0 / 2018-05-18
+
+## :tada: Enhancements
+
+- [#3375]: Add support for comments in `mocha.opts` ([@plroebuck])
+
+## :bug: Fixes
+
+- [#3346]: Exit correctly from `before` hooks when using `--bail` ([@outsideris])
+
+## :book: Documentation
+
+- [#3328]: Mocha-flavored [API docs](https://mochajs.org/api/)! ([@Munter])
+
+## :nut_and_bolt: Other
+
+- [#3330]: Use `Buffer.from()` ([@harrysarson])
+- [#3295]: Remove redundant folder ([@DavNej](https://github.com/DajNev))
+- [#3356](https://github.com/mochajs/mocha/pull/3356): Refactoring ([@plroebuck])
+
+[#3375]: https://github.com/mochajs/mocha/pull/3375
+[#3346]: https://github.com/mochajs/mocha/pull/3346
+[#3328]: https://github.com/mochajs/mocha/pull/3328
+[#3330]: https://github.com/mochajs/mocha/pull/3330
+[#3295]: https://github.com/mochajs/mocha/pull/3295
+
+[@plroebuck]: https://github.com/plroebuck
+[@harrysarson]: https://github.com/harrysarson
+[@outsideris]: https://github.com/outsideris
+[@Munter]: https://github.com/Munter
+
+# 5.1.1 / 2018-04-18
+
+## :bug: Fixes
+
+- [#3325]: Revert change which broke `--watch` ([@boneskull])
+
+[#3325]: https://github.com/mochajs/mocha/issues/3325
+
+# 5.1.0 / 2018-04-12
+
+## :tada: Enhancements
+
+- [#3210]: Add `--exclude` option ([@metalex9])
+
+## :bug: Fixes
+
+- [#3318]: Fix failures in circular objects in JSON reporter ([@jeversmann], [@boneskull])
+
+## :book: Documentation
+
+- [#3323]: Publish actual [API documentation](https://mochajs.org/api/)! ([@dfberry], [@Munter])
+- [#3299]: Improve docs around exclusive tests ([@nicgirault])
+
+## :nut_and_bolt: Other
+
+- [#3302], [#3308], [#3310], [#3315], [#3316]: Build matrix improvements ([more info](https://boneskull.com/mocha-and-travis-ci-build-stages/)) ([@outsideris], [@boneskull])
+- [#3272]: Refactor reporter tests ([@jMuzsik])
+
+[#3210]: https://github.com/mochajs/mocha/pull/3210
+[#3318]: https://github.com/mochajs/mocha/pull/3318
+[#3323]: https://github.com/mochajs/mocha/pull/3323
+[#3299]: https://github.com/mochajs/mocha/pull/3299
+[#3302]: https://github.com/mochajs/mocha/pull/3302
+[#3308]: https://github.com/mochajs/mocha/pull/3308
+[#3310]: https://github.com/mochajs/mocha/pull/3310
+[#3315]: https://github.com/mochajs/mocha/pull/3315
+[#3316]: https://github.com/mochajs/mocha/pull/3316
+[#3272]: https://github.com/mochajs/mocha/pull/3272
+[@metalex9]: https://github.com/metalex9
+[@jeversmann]: https://github.com/jeversmann
+[@dfberry]: https://github.com/dfberry
+[@nicgirault]: https://github.com/nicgirault
+[@jMuzsik]: https://github.com/jMuzsik
+
 # 5.0.5 / 2018-03-22
 
 Welcome [@outsideris] to the team!

MAINTAINERS.md

@@ -18,7 +18,7 @@ Anyone involved with Mocha will fall into one of these buckets: **user**, **cont
 
 A "user" for the purpose of this document is any *individual developer* who consumes Mocha to write and/or execute tests.  A user interacts with contributors.  A user interacts with the software, web site, documentation, etc., which these contributors provide.
 
-As a user, you're expected to follow the [code of conduct](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) when interacting in Mocha's "official" social spaces. This includes:
+As a user, you're expected to follow the [code of conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) when interacting in Mocha's "official" social spaces. This includes:
 
 - Any chatroom under the `mochajs` organization on Gitter
 - Any project under the `mochajs` organization on GitHub
@@ -45,7 +45,7 @@ A "contributor" is any individual who has *given back* in some way to the projec
 1. Recruiting more contributors! Don't spam.
 1. Researching the user base, getting feedback, etc. Don't spam.
 
-A contributor is *usually* a user as well, but this isn't a hard-and-fast rule. A contributor is also expected to adhere to the [code of conduct](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) as a user would.
+A contributor is *usually* a user as well, but this isn't a hard-and-fast rule. A contributor is also expected to adhere to the [code of conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) as a user would.
 
 As you can see, it's wide open!  Think of it another way: if you are *adding value to Mocha*, then you are a contributor.
 

appveyor.yml

@@ -2,16 +2,16 @@ platform:
   - x64
 environment:
   matrix:
+    - nodejs_version: '10'
+    - nodejs_version: '9'
     - nodejs_version: '8'
-    - nodejs_version: '7'
     - nodejs_version: '6'
-    - nodejs_version: '4'
 install:
   - ps: Install-Product node $env:nodejs_version x64
   - set CI=true
   - set PATH=%APPDATA%\npm;c:\MinGW\bin;%PATH%
-  - npm install -g npm
-  - npm install
+  - npm install -g npm@^5
+  - npm ci --ignore-scripts
 matrix:
   fast_finish: true
 build: off