Skip to content

Commit

Permalink
Merge 075bd51 into 5fcc1b5
Browse files Browse the repository at this point in the history
  • Loading branch information
prianchiru committed Aug 8, 2017
2 parents 5fcc1b5 + 075bd51 commit 9984973
Show file tree
Hide file tree
Showing 24 changed files with 1,323 additions and 971 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Expand Up @@ -69,10 +69,6 @@ matrix:

before_install: scripts/travis-before-install.sh

install:
- npm install
- cd node_modules && ln -nsf @coderbyheart/karma-sauce-launcher karma-sauce-launcher && cd ../

before_script: scripts/travis-before-script.sh

script: make $TARGET
Expand Down
35 changes: 33 additions & 2 deletions CHANGELOG.md
@@ -1,9 +1,40 @@
# 3.5.0 / 2017-07-31

## :newspaper: News

- Mocha now has a [code of conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) (thanks [@kungapal]!).
- Old issues and PRs are now being marked "stale" by [Probot's "Stale" plugin](https://github.com/probot/stale). If an issue is marked as such, and you would like to see it remain open, simply add a new comment to the ticket or PR.
- **WARNING**: Support for non-ES5-compliant environments will be dropped starting with version 4.0.0 of Mocha!

## :lock: Security Fixes

- [#2860]: Address [CVE-2015-8315](https://nodesecurity.io/advisories/46) via upgrade of [debug](https://npm.im/debug) ([@boneskull])

## :tada: Enhancements

- [#2696]: Add `--forbid-only` and `--forbid-pending` flags. Use these in CI or hooks to ensure tests aren't accidentally being skipped! ([@charlierudolph])
- [#2813]: Support Node.js 8's `--napi-modules` flag ([@jupp0r])

## :nut_and_bolt: Other

- Various CI-and-test-related fixes and improvements ([@boneskull], [@dasilvacontin], [@PopradiArpad], [@Munter], [@ScottFreeCode])
- "Officially" support Node.js 8 ([@elergy])

[#2860]: https://github.com/mochajs/mocha/pulls/2860
[#2696]: https://github.com/mochajs/mocha/pulls/2696
[#2813]: https://github.com/mochajs/mocha/pulls/2813
[@charlierudolph]: https://github.com/charlierudolph
[@PopradiArpad]: https://github.com/PopradiArpad
[@kungapal]: https://github.com/kungapal
[@elergy]: https://github.com/elergy
[@jupp0r]: https://github.com/jupp0r

# 3.4.2 / 2017-05-24

## :bug: Fixes

- [#2802]: Remove call to deprecated os.tmpDir ([@makepanic])
- [#2820]: Eagerly set process.exitCode ([@chrisleck])
- [#2802]: Remove call to deprecated `os.tmpDir` ([@makepanic])
- [#2820]: Eagerly set `process.exitCode` ([@chrisleck])

## :nut_and_bolt: Other

Expand Down
18 changes: 10 additions & 8 deletions Makefile
Expand Up @@ -52,7 +52,7 @@ lint:
@printf "==> [Test :: Lint]\n"
npm run lint

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-global-only
test-node: test-bdd test-tdd test-qunit test-exports test-unit test-integration test-jsapi test-compilers test-requires test-reporters test-only test-global-only

test-browser: clean BUILDTMP/mocha.js test-browser-unit test-browser-bdd test-browser-qunit test-browser-tdd test-browser-exports

Expand Down Expand Up @@ -91,9 +91,15 @@ test-integration:

test-compilers:
@printf "==> [Test :: Compilers]\n"
$(call test_node,compilers) --compilers coffee:coffee-script/register,foo:./test/compiler/foo \
test/compiler/test.coffee \
test/compiler/test.foo
$(call test_node,compilers-coffee) --compilers coffee:coffee-script/register \
test/compiler

$(call test_node,compilers-custom) --compilers foo:./test/compiler-fixtures/foo \
test/compiler

$(call test_node,compilers-multiple) \
--compilers coffee:coffee-script/register,foo:./test/compiler-fixtures/foo \
test/compiler

test-requires:
@printf "==> [Test :: Requires]\n"
Expand Down Expand Up @@ -124,10 +130,6 @@ test-exports:
$(call test_node,exports) --ui exports \
test/interfaces/exports.spec

test-glob:
@printf "==> [Test :: Glob]\n"
bash ./test/glob/glob.sh

test-reporters:
@printf "==> [Test :: Reporters]\n"
$(call test_node,reporters) test/reporters/*.spec.js
Expand Down

0 comments on commit 9984973

Please sign in to comment.