Merge branch 'master' into issue-2429

.eslintignore

@@ -2,3 +2,4 @@ coverage/
 lib/to-iso-string/**/*.js
 mocha.js
 BUILDTMP
+*.fixture.js

.github/CONTRIBUTING.md

@@ -62,7 +62,7 @@ Follow these steps to get going.  If you are having trouble, don't be afraid to
 1.  Navigate to the source repository.  You should see a notification about your recent changes in your fork's branch, with a button to create a pull request.  Click it.
 1.  Describe your changes in detail here.  Once you're satisfied, submit the form.
   - *PRO TIP*: If you've used a multi-line commit message, Github will pre-fill the PR's description with it.
-1.  If you have not signed our Contributor License Agreement, a friendly robot will prompt you to do so.  A CLA (electronic) signature is **required** for all contributions of code to Mocha.
+1.  If you have not signed our Contributor License Agreement, a friendly robot will prompt you to do so.  A [CLA](https://cla.js.foundation/mochajs/mocha) (electronic) signature is **required** for all contributions of code to Mocha.
 1.  CI will run against your changes.
   - If the changes fail the checks, you will need to address those before merging.
   - You don't need to make a new PR to make changes.  Instead, commit on top of your changes, and push these to your fork's branch.  The PR will be updated, and CI will re-run.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,49 @@
+<!--
+Have you read Mocha's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md
+For more, check out the Mocha Gitter chat room: https://gitter.im/mochajs/mocha
+-->
+
+### Prerequisites
+<!--
+Place an `x` between the square brackets on the lines below for every satisified prerequisite.
+-->
+* [ ] Checked that your issue isn't already filed by cross referencing [issues with the `common mistake` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Acommon-mistake%20)
+* [ ] Checked next-gen ES issues and syntax problems by using the same environment and/or transpiler configuration without Mocha to ensure it isn't just a feature that actually isn't supported in the environment in question or a bug in your code.
+* [ ] 'Smoke tested' the code to be tested by running it outside the real test suite to get a better sense of whether the problem is in the code under test, your usage of Mocha, or Mocha itself
+* [ ] Ensured that there is no discrepancy between the locally and globally installed versions of Mocha. You can find them with:
+`node node_modules/.bin/mocha --version`(Local) and `mocha --version`(Global). We recommend avoiding the use of globally installed Mocha.
+
+### Description
+<!--
+[Description of the issue]
+-->
+
+### Steps to Reproduce
+
+<!--
+Please add a series of steps to reproduce the problem. See https://stackoverflow.com/help/mcve for in depth information
+on how to create a mimimal, complete, and verifiable example.
+-->
+
+**Expected behavior:** [What you expect to happen]
+
+**Actual behavior:** [What actually happens]
+
+**Reproduces how often:** [What percentage of the time does it reproduce?]
+
+### Versions
+<!--
+ If applicable, please specify:
+ * The output of `mocha --version` and `node node_modules/.bin/mocha --version`:
+ * The output of `node --version`:
+ * The version and architecture of your operating system:
+ * Your shell (bash, zsh, PowerShell, cmd, etc.):
+ * Your browser and version (if running browser tests):
+ * Any other third party Mocha related modules (with versions):
+ * The code transpiler being used:
+-->
+
+### Additional Information
+<!--
+Any additional information, configuration or data that might be necessary to reproduce the issue.
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,40 @@
+### Requirements
+
+* Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
+* All new code requires tests to ensure against regressions.
+
+### Description of the Change
+
+<!--
+
+We must be able to understand the design of your change from this description. Keep in mind that the maintainers and/or community members reviewing this PR may not be familiar with the subsystem. Please be verbose.
+
+-->
+
+### Alternate Designs
+
+<!-- Explain what other alternates were considered and why the proposed version was selected -->
+
+### Why should this be in core?
+
+<!-- Explain why this functionality should be in mocha as opposed to its own package -->
+
+### Benefits
+
+<!-- What benefits will be realized by the code change? -->
+
+### Possible Drawbacks
+
+<!-- What are the possible side-effects or negative impacts of the code change? -->
+
+### Applicable issues
+
+<!--
+* Enter any applicable Issues here.
+
+* Mocha follows semantic versioning: http://semver.org
+
+* Is this a breaking change (major release)?
+* Is it an enhancement (minor release)?
+* Is it a bug fix, or does it not impact production code (patch release)?
+-->

.github/stale.yml

@@ -26,6 +26,7 @@ exemptLabels:
   - semver-patch
   - reporter
   - common-mistake
+  - developer-experience
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable

.travis.yml

@@ -21,58 +21,20 @@ matrix:
       env: TARGET=test-node
     - node_js: '6'
       env: TARGET=test-node
-    - node_js: '5'
-      env: TARGET=test-node
     - node_js: '4'
       env: TARGET=test-node
-    - node_js: 'iojs'
-      env: TARGET=test-node
-    - node_js: '0.12'
-      env: TARGET=test-node
-    - node_js: '0.11'
-      env: TARGET=test-node
-    - node_js: '0.10'
-      env: TARGET=test-node
     - node_js: '8'
       env: TARGET=lint
-    # phantomjs
     - node_js: '8'
       env: TARGET=test-browser
-    # chrome
-    - node_js: '8'
-      env: TARGET=test-browser BROWSER="chrome@latest" PLATFORM="Windows 8"
-    # edge
-    - node_js: '8'
-      env: TARGET=test-browser BROWSER="MicrosoftEdge@latest" PLATFORM="Windows 10"
-    # ie11
-    - node_js: '8'
-      env: TARGET=test-browser BROWSER="internet [email protected]" PLATFORM="Windows 8.1"
-    # ie10
-    - node_js: '8'
-      env: TARGET=test-browser BROWSER="internet [email protected]" PLATFORM="Windows 8"
-    # ie9
-    - node_js: '8'
-      env: TARGET=test-browser BROWSER="internet [email protected]" PLATFORM="Windows 7"
-    # ie8
-    - node_js: '8'
-      env: TARGET=test-browser BROWSER="internet [email protected]" PLATFORM="Windows 7"
-    # ie7
-    - node_js: '8'
-      env: TARGET=test-browser BROWSER="internet [email protected]" PLATFORM="Windows XP"
-    # firefox
-    - node_js: '8'
-      env: TARGET=test-browser BROWSER="firefox@latest" PLATFORM="Windows 8.1"
-    # safari
-    - node_js: '8'
-      env: TARGET=test-browser BROWSER="safari@latest" PLATFORM="OS X 10.11"
 
 before_install: scripts/travis-before-install.sh
 
 before_script: scripts/travis-before-script.sh
 
 script: make $TARGET
 
-after_success: "npm run postcoverage && <coverage/lcov.info ./node_modules/coveralls/bin/coveralls.js"
+after_success: npm run coveralls
 
 notifications:
   urls:
@@ -86,3 +48,4 @@ addons:
     paths:
       - .karma/
       - ./mocha.js
+  sauce_connect: true

CHANGELOG.md

@@ -1,3 +1,47 @@
+# 3.5.3 / 2017-09-11
+
+## :bug: Fixes
+
+- [#3003]: Fix invalid entities in xUnit reporter first appearing in v3.5.1 ([@jkrems])
+
+[#3003]: https://github.com/mochajs/mocha/pull/3003
+
+# 3.5.2 / 2017-09-10
+
+## :bug: Fixes
+
+- [#3001]: Fix AMD-related failures first appearing in v3.5.1 ([@boneskull])
+
+[#3001]: https://github.com/mochajs/mocha/pull/3001
+
+# 3.5.1 / 2017-09-09
+
+## :newspaper: News
+
+- :mega: Mocha is now sponsoring [PDXNode](http://pdxnode.org)!  If you're in the [Portland](https://wikipedia.org/wiki/Portland,_Oregon) area, come check out the monthly talks and hack nights!
+
+## :bug: Fixes
+
+- [#2997]: Fix missing `xit` export for "require" interface ([@solodynamo])
+- [#2957]: Fix unicode character handling in XUnit reporter failures ([@jkrems])
+
+## :nut_and_bolt: Other
+
+- [#2986]: Add issue and PR templates ([@kungapal])
+- [#2918]: Drop bash dependency for glob-related tests ([@ScottFreeCode])
+- [#2922]: Improve `--compilers` coverage ([@ScottFreeCode])
+- [#2981]: Fix tpyos and spelling errors ([@jsoref])
+
+[#2997]: https://github.com/mochajs/mocha/pull/2997
+[#2957]: https://github.com/mochajs/mocha/pull/2957
+[#2918]: https://github.com/mochajs/mocha/pull/2918
+[#2986]: https://github.com/mochajs/mocha/pull/2986
+[#2922]: https://github.com/mochajs/mocha/pull/2922
+[#2981]: https://github.com/mochajs/mocha/pull/2981
+[@solodynamo]: https://github.com/solodynamo
+[@jkrems]: https://github.com/jkrems
+[@jsoref]: https://github.com/jsoref
+
 # 3.5.0 / 2017-07-31
 
 ## :newspaper: News
@@ -863,7 +907,7 @@ Thanks @entertainyou, @SimenB, @just-paja for the heads-up.
   * utils.stringify should handle objects without an Object prototype
   * in runnable test, comparing to undefined error's message rather than a literal
   * Fix test running output truncation on async STDIO
-  * ammended for deprecated customFds option in child_process
+  * amended for deprecated customFds option in child_process
 
 2.1.0 / 2014-12-23
 ==================
@@ -1091,7 +1135,7 @@ Thanks @entertainyou, @SimenB, @just-paja for the heads-up.
 ==================
 
   * add: sort test files with --sort (#813)
-  * update: diff depedency to 1.0.7
+  * update: diff dependency to 1.0.7
   * update: glob dependency to 3.2.3 (#927)
   * fix: diffs show whitespace differences (#976)
   * fix: improve global leaks (#783)

Makefile

@@ -5,7 +5,7 @@ NYC := "node_modules/.bin/nyc"
 
 ifdef COVERAGE
 define test_node
-	$(NYC) --report-dir coverage/reports/$(1) $(MOCHA)
+	$(NYC) --no-clean --report-dir coverage/reports/$(1) $(MOCHA)
 endef
 else
 	test_node := $(MOCHA)
@@ -77,11 +77,12 @@ test-compilers:
 	$(call test_node,compilers-coffee) --compilers coffee:coffee-script/register \
 		test/compiler
 
-	$(call test_node,compilers-custom) --compilers foo:./test/compiler-fixtures/foo \
+	$(call test_node,compilers-custom) \
+	--compilers foo:./test/compiler-fixtures/foo.fixture \
 		test/compiler
 
 	$(call test_node,compilers-multiple) \
-		--compilers coffee:coffee-script/register,foo:./test/compiler-fixtures/foo \
+		--compilers coffee:coffee-script/register,foo:./test/compiler-fixtures/foo.fixture \
 		test/compiler
 
 test-requires:

README.md

@@ -19,7 +19,7 @@
 2.  Review current open pull requests
   - We need individuals familiar with Mocha's codebase. Got questions?  Ask them in [our chat room](https://gitter.im/mochajs/mocha).
   - Pull requests **must** have supporting tests.  The only exceptions are pure cosmetic or non-functional changes.
-  - Pull request contributors must sign the CLA.
+  - Pull request contributors must sign [the CLA](https://cla.js.foundation/mochajs/mocha).
 3. Close old, inactive issues and pull requests
   - ~~A bot should do this.  We need a bot. Got a bot?~~ We now use GitHub's own [probot-stale](https://www.npmjs.com/package/probot-stale).
 4. Triage issues

appveyor.yml

@@ -4,8 +4,6 @@ environment:
     - nodejs_version: '7'
     - nodejs_version: '6'
     - nodejs_version: '4'
-    - nodejs_version: '0.12'
-    - nodejs_version: '0.10'
 install:
   - ps: Install-Product node $env:nodejs_version
   - set CI=true

browser-entry.js

@@ -7,7 +7,7 @@
  * Shim process.stdout.
  */
 
-process.stdout = require('browser-stdout')();
+process.stdout = require('browser-stdout')({level: false});
 
 var Mocha = require('./lib/mocha');