Skip to content

Commit b9c8c1e

Browse files
Merge branch 'master' into patch-2
2 parents 29883fd + 7647e18 commit b9c8c1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+2208
-1005
lines changed

.eslintrc.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
root: true
2+
env:
3+
node: true
4+
browser: true
5+
parserOptions:
6+
ecmaVersion: 5
7+
sourceType: script
8+
extends: semistandard
9+
rules:
10+
strict:
11+
- error
12+
- safe
13+
linebreak-style:
14+
- error
15+
- unix

.github/CODE_OF_CONDUCT.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Mocha Code of Conduct
2+
3+
## Be friendly and patient
4+
We understand that everyone has different levels of experience or knowledge in many diverse fields, be it technical or
5+
non-technical in nature. We also have areas of knowledge we are eager to expand; we want to be a community where people
6+
can not only contribute, but feel comfortable to ask questions as well and learn along the way. If someone says something
7+
wrong, or says something accidentally offensive, respond with patience and try to keep it polite and civil. Remember that
8+
we all were newbies at one point.
9+
10+
## Be welcoming
11+
We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not
12+
limited to, members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class,
13+
educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief,
14+
religion, and mental and physical ability.
15+
16+
## Be considerate
17+
Your work will be used by other people, and you in turn will depend on the work of others. Any decision you make will affect
18+
users and colleagues, and you should take those consequences into account when making decisions. Remember that we’re a world-wide
19+
community, so you might not be communicating in someone else’s primary language.
20+
21+
## Be respectful
22+
Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all
23+
experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important
24+
to remember that a community where people feel uncomfortable or threatened is not a productive one. Members of the JS Foundation
25+
community should be respectful when dealing with other members as well as with people outside the JS Foundation community.
26+
27+
## Be careful in the words that you choose
28+
We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put
29+
down other participants. Harassment and other exclusionary behavior aren’t acceptable. This includes, but is not limited to:
30+
31+
* Violent threats or language directed against another person.
32+
* Discriminatory jokes and language.
33+
* Posting sexually explicit or violent material.
34+
* Posting (or threatening to post) other people’s personally identifying information (“doxing”).
35+
* Personal insults, especially those using racist or sexist terms.
36+
* Unwelcome sexual attention.
37+
* Advocating for, or encouraging, any of the above behavior.
38+
* Repeated harassment of others. In general, if someone asks you to stop, then stop.
39+
40+
## When we disagree, try to understand why
41+
Disagreements, both social and technical, happen all the time and JS Foundation projects are no exception. It is important
42+
that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of the JS
43+
Foundation comes from its varied community, people from a wide range of backgrounds. Different people have different
44+
perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t
45+
forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues
46+
and learning from mistakes.
47+
48+
Original text courtesy of the Speak Up! project and Django Project.
49+
50+
## QUESTIONS?
51+
If you have questions, please see the FAQ. If that doesn’t answer your questions, feel free to email [email protected].
File renamed without changes.

.github/stale.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 120
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 14
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pr-please
8+
- confirmed
9+
- future
10+
- bug
11+
- chore
12+
- feature
13+
- unconfirmed
14+
- usability
15+
- to-merge
16+
- browser
17+
- reporter
18+
- feature
19+
- documentation
20+
- nice-to-have
21+
- needs-review
22+
- qa
23+
- usability
24+
- semver-minor
25+
- semver-major
26+
- semver-patch
27+
- reporter
28+
- common-mistake
29+
# Label to use when marking an issue as stale
30+
staleLabel: stale
31+
# Comment to post when marking an issue as stale. Set to `false` to disable
32+
markComment: >
33+
I am a bot that watches issues for inactivity.
34+
35+
This issue hasn't had any recent activity, and I'm labeling it `stale`. In 14 days, if there are no further comments or activity, I will close this issue.
36+
37+
Thanks for contributing to Mocha!
38+
# Comment to post when closing a stale issue. Set to `false` to disable
39+
closeComment: false

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ npm-debug.log*
1313
.nyc_output/
1414
coverage/
1515
BUILDTMP/
16+
yarn.lock
17+
package-lock.json

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
package-lock=false
2+

.travis.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ env:
1515
matrix:
1616
fast_finish: true
1717
include:
18-
- node_js: '7'
18+
- node_js: '8'
1919
env: TARGET=test-node COVERAGE=true
20+
- node_js: '7'
21+
env: TARGET=test-node
2022
- node_js: '6'
2123
env: TARGET=test-node
2224
- node_js: '5'
@@ -31,37 +33,37 @@ matrix:
3133
env: TARGET=test-node
3234
- node_js: '0.10'
3335
env: TARGET=test-node
34-
- node_js: '7'
36+
- node_js: '8'
3537
env: TARGET=lint
3638
# phantomjs
37-
- node_js: '7'
39+
- node_js: '8'
3840
env: TARGET=test-browser
3941
# chrome
40-
- node_js: '7'
42+
- node_js: '8'
4143
env: TARGET=test-browser BROWSER="chrome@latest" PLATFORM="Windows 8"
4244
# edge
43-
- node_js: '7'
45+
- node_js: '8'
4446
env: TARGET=test-browser BROWSER="MicrosoftEdge@latest" PLATFORM="Windows 10"
4547
# ie11
46-
- node_js: '7'
48+
- node_js: '8'
4749
env: TARGET=test-browser BROWSER="internet [email protected]" PLATFORM="Windows 8.1"
4850
# ie10
49-
- node_js: '7'
51+
- node_js: '8'
5052
env: TARGET=test-browser BROWSER="internet [email protected]" PLATFORM="Windows 8"
5153
# ie9
52-
- node_js: '7'
54+
- node_js: '8'
5355
env: TARGET=test-browser BROWSER="internet [email protected]" PLATFORM="Windows 7"
5456
# ie8
55-
- node_js: '7'
57+
- node_js: '8'
5658
env: TARGET=test-browser BROWSER="internet [email protected]" PLATFORM="Windows 7"
5759
# ie7
58-
- node_js: '7'
60+
- node_js: '8'
5961
env: TARGET=test-browser BROWSER="internet [email protected]" PLATFORM="Windows XP"
6062
# firefox
61-
- node_js: '7'
63+
- node_js: '8'
6264
env: TARGET=test-browser BROWSER="firefox@latest" PLATFORM="Windows 8.1"
6365
# safari
64-
- node_js: '7'
66+
- node_js: '8'
6567
env: TARGET=test-browser BROWSER="safari@latest" PLATFORM="OS X 10.11"
6668

6769
before_install: scripts/travis-before-install.sh

CHANGELOG.md

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,150 @@
1+
# 3.4.2 / 2017-05-24
2+
3+
## :bug: Fixes
4+
5+
- [#2802]: Remove call to deprecated os.tmpDir ([@makepanic])
6+
- [#2820]: Eagerly set process.exitCode ([@chrisleck])
7+
8+
## :nut_and_bolt: Other
9+
10+
- [#2778]: Move linting into an npm script ([@Munter])
11+
12+
[@chrisleck]: https://github.com/chrisleck
13+
[@makepanic]: https://github.com/makepanic
14+
[@Munter]: https://github.com/Munter
15+
16+
[#2778]: https://github.com/mochajs/mocha/pulls/2778
17+
[#2802]: https://github.com/mochajs/mocha/issues/2802
18+
[#2820]: https://github.com/mochajs/mocha/pull/2820
19+
20+
# 3.4.1 / 2017-05-14
21+
22+
Fixed a publishing mishap with git's autocrlf settings.
23+
24+
# 3.4.0 / 2017-05-14
25+
26+
Mocha is now moving to a quicker release schedule: when non-breaking changes are merged, a release should happen that week.
27+
28+
This week's highlights:
29+
30+
- `allowUncaught` added to commandline as `--allow-uncaught` (and bugfixed)
31+
- warning-related Node flags
32+
33+
## :tada: Enhancements
34+
35+
- [#2793], [#2697]: add --allowUncaught to Node.js ([@lrowe])
36+
- [#2733]: Add `--no-warnings` and `--trace-warnings` flags ([@sonicdoe])
37+
38+
## :bug: Fixes
39+
40+
- [#2793], [#2697]: fix broken allowUncaught ([@lrowe])
41+
42+
## :nut_and_bolt: Other
43+
44+
- [#2778]: Add license report and scan status ([@xizhao])
45+
- [#2794]: no special case for macOS running Karma locally ([@boneskull])
46+
- [#2795]: reverts use of semistandard directly ([#2648]) ([@boneskull])
47+
48+
[@lrowe]: https://github.com/lrowe
49+
[@sonicdoe]: https://github.com/sonicdoe
50+
[@xizhao]: https://github.com/xizhao
51+
[@boneskull]: https://github.com/boneskull
52+
53+
[#2795]: https://github.com/mochajs/mocha/pull/2795
54+
[#2733]: https://github.com/mochajs/mocha/pull/2733
55+
[#2793]: https://github.com/mochajs/mocha/pull/2793
56+
[#2697]: https://github.com/mochajs/mocha/pull/2697
57+
[#2778]: https://github.com/mochajs/mocha/pull/2778
58+
[#2794]: https://github.com/mochajs/mocha/pull/2794
59+
60+
# 3.3.0 / 2017-04-24
61+
62+
Thanks to all our contributors, maintainers, sponsors, and users! ❤️
63+
64+
As highlights:
65+
66+
- We've got coverage now!
67+
- Testing is looking less flaky \o/.
68+
- No more nitpicking about "mocha.js" build on PRs.
69+
70+
## :tada: Enhancements
71+
72+
- [#2659]: Adds support for loading reporter from an absolute or relative path ([@sul4bh])
73+
- [#2769]: Support `--inspect-brk` on command-line ([@igwejk])
74+
75+
## :bug: Fixes
76+
77+
- [#2662]: Replace unicode chars w/ hex codes in HTML reporter ([@rotemdan])
78+
79+
## :mag: Coverage
80+
81+
- [#2672]: Add coverage for node tests ([@c089], [@Munter])
82+
- [#2680]: Increase tests coverage for base reporter ([@epallerols])
83+
- [#2690]: Increase tests coverage for doc reporter ([@craigtaub])
84+
- [#2701]: Increase tests coverage for landing, min, tap and list reporters ([@craigtaub])
85+
- [#2691]: Increase tests coverage for spec + dot reporters ([@craigtaub])
86+
- [#2698]: Increase tests coverage for xunit reporter ([@craigtaub])
87+
- [#2699]: Increase tests coverage for json-stream, markdown and progress reporters ([@craigtaub])
88+
- [#2703]: Cover .some() function in utils.js with tests ([@seppevs])
89+
- [#2773]: Add tests for loading reporters w/ relative/absolute paths ([@sul4bh])
90+
91+
## :nut_and_bolt: Other
92+
93+
- Remove bin/.eslintrc; ensure execs are linted ([@boneskull])
94+
- [#2542]: Expand CONTRIBUTING.md ([@boneskull])
95+
- [#2660]: Double timeouts on integration tests ([@Munter])
96+
- [#2653]: Update copyright year ([@Scottkao85], [@Munter])
97+
- [#2621]: Update dependencies to enable Greenkeeper ([@boneskull], [@greenkeeper])
98+
- [#2625]: Use trusty container in travis-ci; use "artifacts" addon ([@boneskull])
99+
- [#2670]: doc(CONTRIBUTING): fix link to org members ([@coderbyheart])
100+
- Add Mocha propaganda to README.md ([@boneskull])
101+
- [#2470]: Avoid test flake in "delay" test ([@boneskull])
102+
- [#2675]: Limit browser concurrency on sauce ([@boneskull])
103+
- [#2669]: Use temporary test-only build of mocha.js for browsers tests ([@Munter])
104+
- Fix "projects" link in README.md ([@boneskull])
105+
- [#2678]: Chore(Saucelabs): test on IE9, IE10 and IE11 ([@coderbyheart])
106+
- [#2648]: Use `semistandard` directly ([@kt3k])
107+
- [#2727]: Make the build reproducible ([@lamby])
108+
109+
[@boneskull]: https://github.com/boneskull
110+
[@c089]: https://github.com/c089
111+
[@coderbyheart]: https://github.com/coderbyheart
112+
[@craigtaub]: https://github.com/craigtaub
113+
[@epallerols]: https://github.com/epallerols
114+
[@greenkeeper]: https://github.com/greenkeeper
115+
[@igwejk]: https://github.com/igwejk
116+
[@kt3k]: https://github.com/kt3k
117+
[@lamby]: https://github.com/lamby
118+
[@Munter]: https://github.com/Munter
119+
[@rotemdan]: https://github.com/rotemdan
120+
[@seppevs]: https://github.com/seppevs
121+
[@sul4bh]: https://github.com/sul4bh
122+
123+
[#2470]: https://github.com/mochajs/mocha/pull/2470
124+
[#2542]: https://github.com/mochajs/mocha/issues/2542
125+
[#2621]: https://github.com/mochajs/mocha/pull/2621
126+
[#2625]: https://github.com/mochajs/mocha/pull/2625
127+
[#2648]: https://github.com/mochajs/mocha/pull/2648
128+
[#2653]: https://github.com/mochajs/mocha/pull/2653
129+
[#2659]: https://github.com/mochajs/mocha/pull/2659
130+
[#2660]: https://github.com/mochajs/mocha/pull/2660
131+
[#2662]: https://github.com/mochajs/mocha/pull/2662
132+
[#2669]: https://github.com/mochajs/mocha/pull/2669
133+
[#2670]: https://github.com/mochajs/mocha/pull/2670
134+
[#2672]: https://github.com/mochajs/mocha/pull/2672
135+
[#2675]: https://github.com/mochajs/mocha/pull/2675
136+
[#2678]: https://github.com/mochajs/mocha/pull/2678
137+
[#2680]: https://github.com/mochajs/mocha/pull/2680
138+
[#2690]: https://github.com/mochajs/mocha/pull/2690
139+
[#2691]: https://github.com/mochajs/mocha/pull/2691
140+
[#2698]: https://github.com/mochajs/mocha/pull/2698
141+
[#2699]: https://github.com/mochajs/mocha/pull/2699
142+
[#2701]: https://github.com/mochajs/mocha/pull/2701
143+
[#2703]: https://github.com/mochajs/mocha/pull/2703
144+
[#2727]: https://github.com/mochajs/mocha/pull/2727
145+
[#2769]: https://github.com/mochajs/mocha/pull/2769
146+
[#2773]: https://github.com/mochajs/mocha/pull/2773
147+
1148
# 3.2.0 / 2016-11-24
2149

3150
## :newspaper: News

0 commit comments

Comments
 (0)