Skip to content

Commit 880bdd9

Browse files
author
Dmitry Sorin
committed
Merge remote-tracking branch 'upstream/master' into fix/cannot-read-property-currentretry
* upstream/master: helpful error when necessary suite callback omitted; closes mochajs#1744 Fix an issue and add relevant tests when describe and xdescribe fail when not supplied with a callback (issue mochajs#1744). rename more fixtures; closes mochajs#2383 Report non-match to STDERR and exit if no files are matched (mochajs#2450) Exit process with correct error codes (mochajs#2445) fix test files not using .spec suffix fix test fixtures not using .fixture suffix always halt execution when async skip() called; closes mochajs#2465 (mochajs#2479) avoid test flake in "delay" test; closes mochajs#2469 (mochajs#2470) revert accidental change to bin paths disregard function names when testing under Node.js 6.5.0; closes mochajs#2467 (mochajs#2477) lints more files; add more files to lint check; closes mochajs#2457 adds *.orig to .gitignore Exclude the --inspect flag fix check-leaks to catch a leak whose name begins with 'd'
2 parents d5fe815 + 3a2dae8 commit 880bdd9

File tree

140 files changed

+654
-437
lines changed

Some content is hidden

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

140 files changed

+654
-437
lines changed

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
lib/to-iso-string/
2+
test/**/*
3+
!test/runner.js

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ lib/browser/diff.js
1313
npm-debug.log*
1414
.envrc
1515
.karma/
16+
*.orig
17+

Makefile

+15-15
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ clean:
2525

2626
lint:
2727
@printf "==> [Test :: Lint]\n"
28-
$(ESLINT) "lib/**/*.js"
28+
$(ESLINT) browser-entry.js index.js karma.conf.js bin/mocha bin/_mocha "lib/**/*.js" "scripts/**/*.js" test
2929

3030
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
3131

@@ -81,31 +81,31 @@ test-requires:
8181
--require test/acceptance/require/b.coffee \
8282
--require test/acceptance/require/c.js \
8383
--require test/acceptance/require/d.coffee \
84-
test/acceptance/require/require.js
84+
test/acceptance/require/require.spec.js
8585

8686
test-bdd:
8787
@printf "==> [Test :: BDD]\n"
8888
$(MOCHA) --reporter $(REPORTER) \
8989
--ui bdd \
90-
test/acceptance/interfaces/bdd
90+
test/acceptance/interfaces/bdd.spec
9191

9292
test-tdd:
9393
@printf "==> [Test :: TDD]\n"
9494
$(MOCHA) --reporter $(REPORTER) \
9595
--ui tdd \
96-
test/acceptance/interfaces/tdd
96+
test/acceptance/interfaces/tdd.spec
9797

9898
test-qunit:
9999
@printf "==> [Test :: QUnit]\n"
100100
$(MOCHA) --reporter $(REPORTER) \
101101
--ui qunit \
102-
test/acceptance/interfaces/qunit
102+
test/acceptance/interfaces/qunit.spec
103103

104104
test-exports:
105105
@printf "==> [Test :: Exports]\n"
106106
$(MOCHA) --reporter $(REPORTER) \
107107
--ui exports \
108-
test/acceptance/interfaces/exports
108+
test/acceptance/interfaces/exports.spec
109109

110110
test-glob:
111111
@printf "==> [Test :: Glob]\n"
@@ -120,29 +120,29 @@ test-only:
120120
@printf "==> [Test :: Only]\n"
121121
$(MOCHA) --reporter $(REPORTER) \
122122
--ui tdd \
123-
test/acceptance/misc/only/tdd
123+
test/acceptance/misc/only/tdd.spec
124124

125125
$(MOCHA) --reporter $(REPORTER) \
126126
--ui bdd \
127-
test/acceptance/misc/only/bdd
127+
test/acceptance/misc/only/bdd.spec
128128

129129
$(MOCHA) --reporter $(REPORTER) \
130130
--ui qunit \
131-
test/acceptance/misc/only/bdd-require
131+
test/acceptance/misc/only/bdd-require.spec
132132

133133
test-global-only:
134134
@printf "==> [Test :: Global Only]\n"
135135
$(MOCHA) --reporter $(REPORTER) \
136136
--ui tdd \
137-
test/acceptance/misc/only/global/tdd
137+
test/acceptance/misc/only/global/tdd.spec
138138

139139
$(MOCHA) --reporter $(REPORTER) \
140140
--ui bdd \
141-
test/acceptance/misc/only/global/bdd
141+
test/acceptance/misc/only/global/bdd.spec
142142

143143
$(MOCHA) --reporter $(REPORTER) \
144144
--ui qunit \
145-
test/acceptance/misc/only/global/qunit
145+
test/acceptance/misc/only/global/qunit.spec
146146

147147
test-mocha:
148148
@printf "==> [Test :: Mocha]\n"
@@ -152,19 +152,19 @@ test-mocha:
152152
non-tty:
153153
@printf "==> [Test :: Non-TTY]\n"
154154
$(MOCHA) --reporter dot \
155-
test/acceptance/interfaces/bdd 2>&1 > /tmp/dot.out
155+
test/acceptance/interfaces/bdd.spec 2>&1 > /tmp/dot.out
156156

157157
@echo dot:
158158
@cat /tmp/dot.out
159159

160160
$(MOCHA) --reporter list \
161-
test/acceptance/interfaces/bdd 2>&1 > /tmp/list.out
161+
test/acceptance/interfaces/bdd.spec 2>&1 > /tmp/list.out
162162

163163
@echo list:
164164
@cat /tmp/list.out
165165

166166
$(MOCHA) --reporter spec \
167-
test/acceptance/interfaces/bdd 2>&1 > /tmp/spec.out
167+
test/acceptance/interfaces/bdd.spec 2>&1 > /tmp/spec.out
168168

169169
@echo spec:
170170
@cat /tmp/spec.out

0 commit comments

Comments
 (0)