.mailmap

@@ -4,6 +4,7 @@ Travis Jeffery <tj@travisjeffery.com>   Dr. Travis Jeffery <tj@travisjeffery.com
 Christopher Hiller <boneskull@boneskull.com>  Christopher Hiller <chiller@badwing.com>
 David da Silva Contín <dasilvacontin@gmail.com>   David da Silva <daviddasilvacontin@me.com>
 David da Silva Contín <dasilvacontin@gmail.com>   David da Silva <dasilvacontin@gmail.com>
+David da Silva Contín <dasilvacontin@gmail.com>   <daviddasilvacontin@gmail.com>
 Ariel Mashraki <ariel@mashraki.co.il>   Ariel Mashraki <ariel@codeoasis.com>
 Ariel Mashraki <ariel@mashraki.co.il>   Ariel Mashraki <ariel.mashraki@ironsrc.com>
 Forbes Lindesay <forbes@lindesay.co.uk>   Forbes Lindesay <fpfl2@cam.ac.uk>

.npmignore

@@ -0,0 +1,2 @@
+assets/
+

.travis.yml

@@ -1,21 +1,42 @@
+# in order to use 'trusty' dist, need this.
+# see https://docs.travis-ci.com/user/trusty-ci-environment/
+sudo: required
+
+# trust dist provides a modern build chain (as opposed to 'precise' dist)
+# which absolves us from having to install compilers and stuff
+dist: trusty
+
 language: node_js
-env:
-  global:
-   - CXX=g++-4.8
+
+matrix:
+  include:
+    - node_js: '6'
+      env: TARGET="clean lint test-node test-browser"
+    - 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: '0.8'
+      env: TARGET=test-node
+
 before_install:
-- ./scripts/ensure-compatible-npm.sh
-script: travis_retry npm test
-node_js:
-- '5'
-- '4'
-- 'iojs'
-- '0.12'
-- '0.11'
-- '0.10'
-- '0.8'
-sudo: false
+  # node 0.8 won't install our dev deps with an out-of-box npm;
+  # this upgrades it
+  - node ./scripts/upgrade-npm.js
+
+script: travis_retry make $TARGET
+
 notifications:
   urls:
+    # for gitter
     - secure: "EmycFlk48bUvOQ07mxnbcn6T+n3G4wVWuXgrDsUUp6EhJ9866wQK9i+qVhqogWuSEQrGoVaS/vpc/NEYxDP30BD/+nqgvOhVhLVEgtziI85imyV/oUVpArdW3AUmuzCrx7rQCivygjpBmWV9ZcUT5Km4qp1iQhuumy2WbplxrZ4="
   on_success: change
   on_failure: always

CHANGELOG.md

@@ -1,3 +1,94 @@
+# 2.5.1 / 2016-05-23
+
+- Fix [to-iso-string](https://npmjs.com/package/to-iso-string) dependency ([@boneskull] via bd9450b)
+
+Thanks @entertainyou, @SimenB, @just-paja for the heads-up.
+
+# 2.5.0 / 2016-05-23
+
+> This has been awhile coming!  We needed to feel confident that the next release wouldn't break browser compatibility (e.g. the last few patch releases).
+>
+> ### Browser Tests in CI
+>
+> We now run unit tests against PhantomJS v1.x and an assortment of browsers on [SauceLabs](https://saucelabs.com), including:
+> - Internet Explorer v8.0
+> - Chrome (latest)
+> - Firefox (latest)
+> - Safari (latest)
+> - Microsoft Edge (latest)
+>
+> To accomplish this, we now run Mocha's unit tests (and a handful of integration tests) via [Karma](https://npmjs.com/package/karma) and a modified [karma-mocha](https://npmjs.com/package/karma-mocha).  Along the way, we had to solve issue [#880] (apologies to @mderijcke and @sukima who had PRs addressing this), as well as replace most usages of [should](https://npmjs.com/package/should) with [expect.js](https://npmjs.com/package/expect.js) for IE8.
+>
+> Going forward, when sending PRs, your code will *only* run against PhantomJS v1.x (and not hit SauceLabs) [because security](https://docs.travis-ci.com/user/pull-requests/#Security-Restrictions-when-testing-Pull-Requests).
+>
+> ### Node.js 6.x
+> Node.js 6.x "just worked" before, but now it's in the CI matrix, so it's "officially" supported.  Mocha *still retains support* for Node.js 0.8.x.
+>
+> ### "Minor" Release
+> You'll see mostly bug fixes below, but also a couple features--as such, it's a "minor" release.
+>
+> ### TYVM
+>
+> Thanks to everyone who contributed, and our fabulous [sponsors and backers](https://opencollective.com/mochajs)!
+
+- [#2079] - Add browser checks to CI; update [browserify](https://npmjs.com/package/browserify) to v13.0.0 ([@dasilvacontin], [@ScottFreeCode], [@boneskull] via c04c1d7, 0b1e9b3, 0dde0fa, f8a3d86, 9e8cbaa)
+- [#880] - Make Mocha browserifyable ([@boneskull] via 524862b)
+- [#2121] - Update [glob](https://npmjs.com/package/glob) to v3.2.11 ([@astorije] via 7920fc4)
+- [#2126] - Fix dupe error messages in stack trace filter ([@Turbo87] via 4301caa)
+- [#2109] - Fix certain diffs when objects cannot be coerced into primitives ([@joshlory] via 61fbb7f)
+- [#1827] - Fix TWBS/`mocha.css` collisions ([@irnc] via 0543798)
+- [#1760], [#1936] - Fix `this.skip()` in HTML reporter ([@mislav] via cb4248b)
+- [#2115] - Fix exceptions thrown from hooks in HTML reporter ([@danielstjules] via e290bc0)
+- [#2089] - Handle Symbol values in `util.stringify()` ([@ryym] via ea61d05)
+- [#2097] - Fix diff for objects overriding `Object.prototype.hasOwnProperty` ([@mantoni] via b20fdfe)
+- [#2101] - Properly handle non-string "messages" thrown from assertion libraries ([@jkimbo] via 9c41051)
+- [#2124] - Update [growl](https://npmjs.com/package/growl) ([@benjamine] via 9ae6a85)
+- [#2162], [#2205] - JSDoc fixes ([@OlegTsyba] via 8031f20, [@ScottFreeCode] via f83b1d9)
+- [#2132] - Remove Growl-related cruft ([@julienw] via 00d6469)
+- [#2172] - Add [OpenCollective](https://opencollective.com) badge, sponsors & backers ([@xdamman], [@boneskull] via caee94f)
+- [#1841] - Add new logo, banner assets ([@dasilvacontin] via 00fd0e1)
+- [#2214] - Update `README.md` header ([@dasilvacontin] via c0f9be2)
+- [#2236] - Better checks for Node.js v0.8 compatibility in CI ([@dasilvacontin] via ba5637d)
+- [#2239] - Add Node.js v6.x to CI matrix ([@boneskull] via 3904da4)
+
+[#880]: https://github.com/mochajs/mocha/issues/880
+[#1841]: https://github.com/mochajs/mocha/pull/1841
+[#2239]: https://github.com/mochajs/mocha/issues/2239
+[#2153]: https://github.com/mochajs/mocha/pull/2153
+[#2214]: https://github.com/mochajs/mocha/pull/2214
+[#2236]: https://github.com/mochajs/mocha/pull/2236
+[#2079]: https://github.com/mochajs/mocha/issues/2079
+[#2231]: https://github.com/mochajs/mocha/pull/2231
+[#2089]: https://github.com/mochajs/mocha/issues/2089
+[#2097]: https://github.com/mochajs/mocha/pull/2097
+[#1760]: https://github.com/mochajs/mocha/issues/1760
+[#1936]: https://github.com/mochajs/mocha/issues/1936
+[#2115]: https://github.com/mochajs/mocha/pull/2115
+[#1827]: https://github.com/mochajs/mocha/pull/1827
+[#2101]: https://github.com/mochajs/mocha/pull/2101
+[#2124]: https://github.com/mochajs/mocha/pull/2124
+[#2109]: https://github.com/mochajs/mocha/issues/2109
+[#2162]: https://github.com/mochajs/mocha/pull/2162
+[#2132]: https://github.com/mochajs/mocha/issues/2132
+[#2126]: https://github.com/mochajs/mocha/issues/2126
+[#2121]: https://github.com/mochajs/mocha/issues/2121
+[#2205]: https://github.com/mochajs/mocha/pull/2205
+[#2172]: https://github.com/mochajs/mocha/pull/2172
+[@xdamman]: https://github.com/xdamman
+[@Turbo87]: https://github.com/Turbo87
+[@OlegTsyba]: https://github.com/OlegTsyba
+[@ryym]: https://github.com/ryym
+[@mantoni]: https://github.com/mantoni
+[@mislav]: https://github.com/mislav
+[@irnc]: https://github.com/irnc
+[@jkimbo]: https://github.com/jkimbo
+[@benjamine]: https://github.com/benjamine
+[@joshlory]: https://github.com/joshlory
+[@julienw]: https://github.com/julienw
+[@ScottFreeCode]: https://github.com/ScottFreeCode
+[@astorije]: https://github.com/astorije
+[@dasilvacontin]: https://github.com/dasilvacontin
+
 2.4.5 / 2016-01-28
 ==================
 

Makefile

@@ -1,15 +1,18 @@
 BROWSERIFY := node_modules/.bin/browserify
 ESLINT := node_modules/.bin/eslint
+KARMA := node_modules/.bin/karma
 
 REPORTER ?= spec
 TM_BUNDLE = JavaScript\ mocha.tmbundle
 SRC = $(shell find lib -name "*.js" -type f | sort)
+TESTS = $(shell find test -name "*.js" -type f | sort)
 SUPPORT = $(wildcard support/*.js)
 
 all: mocha.js
 
 mocha.js: $(SRC) $(SUPPORT)
-	@$(BROWSERIFY) ./support/browser-entry \
+	@printf "==> [Browser :: build]\n"
+	@$(BROWSERIFY) ./browser-entry \
 		--ignore 'fs' \
 		--ignore 'glob' \
 		--ignore 'jade' \
@@ -18,48 +21,75 @@ mocha.js: $(SRC) $(SUPPORT)
 		--exclude './lib-cov/mocha' > $@
 
 clean:
+	@printf "==> [Clean]\n"
 	rm -f mocha.js
 	rm -rf test-outputs
-	rm -fr lib-cov
+	rm -rf lib-cov
 	rm -f coverage.html
 
 test-cov: lib-cov
+	@printf "==> [Test :: Coverage]\n"
 	@COV=1 $(MAKE) test REPORTER=html-cov > coverage.html
 
 lib-cov:
+	@printf "==> [Coverage]\n"
 	@rm -fr ./$@
 	@jscoverage lib $@
 
 lint:
+	@printf "==> [Test :: Lint]\n"
 	@$(ESLINT) $(SRC)
 
-test: lint test-unit
+test-node: test-bdd test-tdd test-qunit test-exports test-unit test-integration test-jsapi test-compilers test-glob test-requires test-reporters test-only
 
-test-all: lint test-bdd test-tdd test-qunit test-exports test-unit test-integration test-jsapi test-compilers test-glob test-requires test-reporters test-only
+test-browser: test-browser-unit test-browser-bdd test-browser-qunit test-browser-tdd test-browser-exports
+
+test: lint test-node test-browser
+
+test-browser-unit: mocha.js
+	@printf "==> [Test :: Browser]\n"
+	@NODE_PATH=. $(KARMA) start
+
+test-browser-bdd:
+	@printf "==> [Test :: Browser :: BDD]\n"
+	@MOCHA_UI=bdd $(MAKE) test-browser-unit
+
+test-browser-qunit:
+	@printf "==> [Test :: Browser :: QUnit]\n"
+	@MOCHA_UI=qunit $(MAKE) test-browser-unit
+
+test-browser-tdd:
+	@printf "==> [Test :: Browser :: TDD]\n"
+	@MOCHA_UI=tdd $(MAKE) test-browser-unit
 
 test-jsapi:
+	@printf "==> [Test :: JS API]\n"
 	@node test/jsapi
 
 test-unit:
+	@printf "==> [Test :: Unit]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		test/acceptance/*.js \
 		--growl \
 		test/*.js
 
 test-integration:
+	@printf "==> [Test :: Integrations]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		test/integration/*.js
 
 test-compilers:
+	@printf "==> [Test :: Compilers]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		--compilers coffee:coffee-script/register,foo:./test/compiler/foo \
 		test/acceptance/test.coffee \
 		test/acceptance/test.foo
 
 test-requires:
+	@printf "==> [Test :: Requires]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		--compilers coffee:coffee-script/register \
@@ -70,38 +100,45 @@ test-requires:
 		test/acceptance/require/require.js
 
 test-bdd:
+	@printf "==> [Test :: BDD]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		--ui bdd \
 		test/acceptance/interfaces/bdd
 
 test-tdd:
+	@printf "==> [Test :: TDD]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		--ui tdd \
 		test/acceptance/interfaces/tdd
 
 test-qunit:
+	@printf "==> [Test :: QUnit]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		--ui qunit \
 		test/acceptance/interfaces/qunit
 
 test-exports:
+	@printf "==> [Test :: Exports]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		--ui exports \
 		test/acceptance/interfaces/exports
 
 test-glob:
+	@printf "==> [Test :: Glob]\n"
 	@./test/acceptance/glob/glob.sh
 
 test-reporters:
+	@printf "==> [Test :: Reporters]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		test/reporters/*.js
 
 test-only:
+	@printf "==> [Test :: Only]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		--ui tdd \
@@ -123,11 +160,13 @@ test-only:
 		test/acceptance/misc/only/qunit
 
 test-mocha:
+	@printf "==> [Test :: Mocha]\n"
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		test/mocha
 
 non-tty:
+	@printf "==> [Test :: Non-TTY]\n"
 	@./bin/mocha \
 		--reporter dot \
 		test/acceptance/interfaces/bdd 2>&1 > /tmp/dot.out
@@ -150,6 +189,7 @@ non-tty:
 	@cat /tmp/spec.out
 
 tm:
+	@printf "==> [TM]\n"
 	@open editors/$(TM_BUNDLE)
 
-.PHONY: test-cov test-jsapi test-compilers watch test test-all test-bdd test-tdd test-qunit test-exports test-unit test-integration non-tty tm clean
+.PHONY: test-cov test-jsapi test-compilers watch test test-node test-bdd test-tdd test-qunit test-exports test-unit test-integration non-tty tm clean test-browser test-browser-unit test-browser-bdd test-browser-qunit test-browser-tdd test-browser-exports lint