Merge branch 'master' of github.com:mochajs/mocha into inspect

* 'master' of github.com:mochajs/mocha: (79 commits)
  Release v3.0.1
  update CHANGELOG.md; rebuild [ci skip]
  fix nested describe.only suites; closes mochajs#2406
  update date in CHANGELOG.md [ci skip]
  Release v3.0.0
  rebuild mocha.js
  fix bad merge of karma.conf.js
  add note about spec reporter to CHANGELOG.md [ci skip]
  fixed typo in mocha.css introduced by 185c0d9 [ci skip]
  Remove carriage return before each test line in spec reporter. Served no purpose
  add "logo" field to package.json [ci skip]
  fix incorrect executable name with new version of commander
  add bower.json to published package for npmcdn support [ci skip]
  fix broken/wrong URLs in CHANGELOG.md [ci skip]
  Release v3.0.0-2
  rebuild mocha.js
  add browser-stdout to dependencies
  update CHANGELOG [ci skip]
  let child suites run if parent is exclusive; closes mochajs#2378 (mochajs#2387)
  Upgrade eslint package to 2.13 version (mochajs#2389)
  ...

.eslintignore

@@ -0,0 +1 @@
+lib/to-iso-string/

.eslintrc

@@ -112,12 +112,11 @@ rules:
   radix: 2
   semi: [2, always]
   semi-spacing: [2, { before: false, after: true }]
-  space-after-keywords: [2, always]
   space-before-blocks: [2, always]
   space-before-function-paren: [2, never]
   space-in-parens: [2, never]
   space-infix-ops: 2
-  space-return-throw-case: 2
+  keyword-spacing: 2
   space-unary-ops: [2, { words: true, nonwords: false }]
   spaced-comment: [2, always, { exceptions: ['!'] }]
   strict: [0, global]                                                      # TODO: Change to error

.gitignore

@@ -1,8 +1,5 @@
-coverage.html
-lib-cov
 .DS_Store
 node_modules
-test-outputs
 *.sock
 testing
 _mocha.js
@@ -15,3 +12,4 @@ lib/browser/diff.js
 *.diff
 npm-debug.log*
 .envrc
+.karma/

.travis.yml

@@ -9,12 +9,19 @@ dist: trusty
 language: node_js
 
 env:
-  global: PHANTOMJS_CDNURL='https://cnpmjs.org/downloads'
+  global:
+    # phantomjs hosts binaries @ bitbucket, which has fairly restrictive
+    # rate-limiting.  pull it from this sketchy site in China instead.
+    - PHANTOMJS_CDNURL='https://cnpmjs.org/downloads'
+    # we're going to use s3 to temporarily store Karma test bundles for debugging
+    - AWS_ACCESS_KEY_ID=AKIAJ3QQTLQXWXYJ6PTA
+    - secure: k4musDC734E1NFOWaY5qb/l0B9K1cfusFTvMZFayTMs5ubKjeNYCgct2sDSvO5tO7Un935I0sYOOSRPvANPhs8dP1a/8/x0PnwIfnpoCFQCCaI0bWnIQj7nOZ2TaEB/fngZCerCFpNDlzqI6BmaR+XoMvA74v2YD/vVXnzvXNQk=
 
 matrix:
+  fast_finish: true
   include:
     - node_js: '6'
-      env: TARGET='clean lint test-node test-browser'
+      env: TARGET=test-node
     - node_js: '5'
       env: TARGET=test-node
     - node_js: '4'
@@ -27,19 +34,22 @@ matrix:
       env: TARGET=test-node
     - node_js: '0.10'
       env: TARGET=test-node
-    - node_js: '0.8'
-      env: TARGET=test-node
+    - node_js: '6'
+      env: TARGET=lint
+    - node_js: '6'
+      env: TARGET=test-browser S3=1
+
+before_install: scripts/travis-before-install.sh
+
+before_script: scripts/travis-before-script.sh
 
-before_install:
-  # node 0.8 won't install our dev deps with an out-of-box npm;
-  # this upgrades it
-  - node ./scripts/upgrade-npm.js
+script: make $TARGET
 
-script: travis_retry make $TARGET
+after_script: scripts/travis-after-script.sh
 
 notifications:
   urls:
     # for gitter
-    - secure: "nSYqkR0NKB/vB3PsPS+7+U2ZGhP+NbqFncPPZxsGb0TeRvuRL62BemEZGs5+VsajutCN8Dn/yXSIWkYZ6ivZt8xSQ9vk2OnboBMPH/e8P9t+6BBUyIb4ztJuHbsUyx1POYFyukT2TiqRuEGvUUACeXH0OIrWNPt254DipDhe2P0="
+    - secure: fUrHenYJs+pTuLtgBRoYyrlyfVekxaIGmLWq7bhUUqBj/7p5eCkQFn13LlPht0/4WWZOiPBcdTN7tKnz3Ho7ATUJhAchvOWDUgL5gtTvOzeCHbPuCvHz/VLK6hMoPdbLA45M864NDLotfHvyh62WgQaVw9iPc80eb+umaDPrYiU=
   on_success: change
   on_failure: always

CHANGELOG.md

@@ -1,3 +1,116 @@
+# 3.0.1 / 2016-08-03
+
+## :bug: Bug Fix
+
+- [#2406]: Restore execution of nested `describe.only()` suites ([@not-an-aardvark])
+
+[#2406]: https://github.com/mochajs/mocha/issues/2406
+[@not-an-aardvark]: https://github.com/not-an-aardvark
+
+# 3.0.0 / 2016-07-31
+
+## :boom: Breaking Changes
+
+- :warning: Due to the increasing difficulty of applying security patches made within its dependency tree, as well as looming incompatibilities with Node.js v7.0, **Mocha no longer supports Node.js v0.8**.
+- :warning: **Mocha may no longer be installed by versions of `npm` less than `1.4.0`.**  Previously, this requirement only affected Mocha's development dependencies.  In short, this allows Mocha to depend on packages which have dependencies fixed to major versions (`^`).
+- `.only()` is no longer "fuzzy", can be used multiple times, and generally just works like you think it should. :joy:
+- To avoid common bugs, when a test injects a callback function (suggesting asynchronous execution), calls it, *and* returns a `Promise`, Mocha will now throw an exception:
+
+  ```js
+  const assert = require('assert');
+
+  it('should complete this test', function (done) {
+    return new Promise(function (resolve) {
+      assert.ok(true);
+      resolve();
+    })
+      .then(done);
+  });
+  ```
+
+  The above test will fail with `Error: Resolution method is overspecified. Specify a callback *or* return a Promise; not both.`.
+- When a test timeout value *greater than* `2147483648` is specified in any context (`--timeout`, `mocha.setup()`, per-suite, per-test, etc.), the timeout will be *disabled* and the test(s) will be allowed to run indefinitely.  This is equivalent to specifying a timeout value of `0`.  See [MDN](https://developer.mozilla.org/docs/Web/API/WindowTimers/setTimeout#Maximum_delay_value) for reasoning.
+- The `dot` reporter now uses more visually distinctive characters when indicating "pending" and "failed" tests.
+- Mocha no longer supports [component](https://www.npmjs.com/package/component).
+- The long-forsaken `HTMLCov` and `JSONCov` reporters--and any relationship to the "node-jscoverage" project--have been removed.
+- `spec` reporter now omits leading carriage returns (`\r`) in non-TTY environment.
+
+## :tada: Enhancements
+
+- [#808]: Allow regular-expression-like strings in `--grep` and browser's `grep` querystring; enables flags such as `i` for case-insensitive matches and `u` for unicode. ([@a8m])
+- [#2000]: Use distinctive characters in `dot` reporter; `,` will denote a "pending" test and `!` will denote a "failing" test. ([@elliottcable])
+- [#1632]: Throw a useful exception when a suite or test lacks a title. ([@a8m])
+- [#1481]: Better `.only()` behavior. ([@a8m])
+- [#2334]: Allow `this.skip()` in async tests and hooks. ([@boneskull])
+- [#1320]: Throw a useful exception when test resolution method is overspecified. ([@jugglinmike])
+- [#2364]: Support `--preserve-symlinks`. ([@rosswarren])
+
+## :bug: Bug Fixes
+
+- [#2259]: Restore ES3 compatibility.  Specifically, support an environment lacking `Date.prototype.toISOString()`, `JSON`, or has a non-standard implementation of `JSON`. ([@ndhoule], [@boneskull])
+- [#2286]: Fix `after()` failing to execute if test skipped using `this.skip()` in `beforeEach()`; no longer marks the entire suite as "pending". ([@dasilvacontin], [@boneskull])
+- [#2208]: Fix function name display in `markdown` and `html` (browser) reporters. ([@ScottFreeCode])
+- [#2299]: Fix progress bar in `html` (browser) reporter. ([@AviVahl])
+- [#2307]: Fix `doc` reporter crashing when test fails. ([@jleyba])
+- [#2323]: Ensure browser entry point (`browser-entry.js`) is published to npm (for use with bundlers).  ([@boneskull])
+- [#2310]: Ensure custom reporter with an absolute path works in Windows. ([@silentcloud])
+- [#2311]: Fix problem wherein calling `this.slow()` without a value would blast any previously set value. ([@boneskull])
+- [#1813]: Ensure Mocha's own test suite will run in Windows. ([@tswaters], [@TimothyGu], [@boneskull])
+- [#2317]: Ensure all interfaces are displayed in `--help` on CLI.  ([@ScottFreeCode])
+- [#1644]: Don't exhibit undefined behavior when calling `this.timeout()` with very large values ([@callumacrae], [@boneskull])
+- [#2361]: Don't truncate name of thrown anonymous exception. ([@boneskull])
+- [#2367]: Fix invalid CSS. ([@bensontrent])
+- [#2401]: Remove carriage return before each test line in spec reporter. ([@Munter])
+
+## :nut_and_bolt: Other
+
+- Upgrade production dependencies to address security advisories (and because now we can): `glob`, `commander`, `escape-string-regexp`,
+and `supports-color`. ([@boneskull], [@RobLoach])
+- Add Windows to CI. ([@boneskull], [@TimothyGu])
+- Ensure appropriate `engines` field in `package.json`. ([@shinnn], [@boneskull])
+- [#2348]: Upgrade ESLint to v2 ([@anthony-redfox])
+
+We :heart: our [backers and sponsors](https://opencollective.com/mochajs)!
+
+:shipit:
+
+[#2401]: https://github.com/mochajs/mocha/pull/2401
+[#2348]: https://github.com/mochajs/mocha/issues/2348
+[#808]: https://github.com/mochajs/mocha/issues/808
+[#2361]: https://github.com/mochajs/mocha/pull/2361
+[#2367]: https://github.com/mochajs/mocha/pull/2367
+[#2364]: https://github.com/mochajs/mocha/pull/2364
+[#1320]: https://github.com/mochajs/mocha/pull/1320
+[#2307]: https://github.com/mochajs/mocha/pull/2307
+[#2259]: https://github.com/mochajs/mocha/pull/2259
+[#2208]: https://github.com/mochajs/mocha/pull/2208
+[#2299]: https://github.com/mochajs/mocha/pull/2299
+[#2286]: https://github.com/mochajs/mocha/issues/2286
+[#1644]: https://github.com/mochajs/mocha/issues/1644
+[#2310]: https://github.com/mochajs/mocha/issues/2310
+[#2311]: https://github.com/mochajs/mocha/issues/2311
+[#2323]: https://github.com/mochajs/mocha/issues/2323
+[#2000]: https://github.com/mochajs/mocha/pull/2000
+[#1632]: https://github.com/mochajs/mocha/issues/1632
+[#1813]: https://github.com/mochajs/mocha/issues/1813
+[#2334]: https://github.com/mochajs/mocha/issues/2334
+[#2317]: https://github.com/mochajs/mocha/issues/2317
+[#1481]: https://github.com/mochajs/mocha/issues/1481
+[@elliottcable]: https://github.com/elliottcable
+[@RobLoach]: https://github.com/robloach
+[@AviVahl]: https://github.com/avivahl
+[@silentcloud]: https://github.com/silentcloud
+[@tswaters]: https://github.com/tswaters
+[@jleyba]: https://github.com/jleyba
+[@TimothyGu]: https://github.com/timothygu
+[@callumacrae]: https://github.com/callumacrae
+[@shinnn]: https://github.com/shinnn
+[@bensontrent]: https://github.com/bensontrent
+[@jugglinmike]: https://github.com/jugglinmike
+[@rosswarren]: https://github.com/rosswarren
+[@anthony-redfox]: https://github.com/anthony-redfox
+[@Munter]: https://github.com/munter
+
 # 2.5.3 / 2016-05-25
 
 - [#2112] - Fix HTML reporter regression causing duplicate error output ([@danielstjules] via 6d24063)