Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add integration tests #1675

Merged
merged 1 commit into from
May 5, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 4 additions & 56 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ lib-cov:

test: test-unit

test-all: test-bdd test-tdd test-qunit test-exports test-unit test-grep test-jsapi test-compilers test-sort test-glob test-requires test-reporters test-only test-failing test-regression
test-all: 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-jsapi:
@node test/jsapi
Expand All @@ -48,25 +48,10 @@ test-unit:
--growl \
test/*.js

test-regression: test-outputs/issue1327/case-out.json
test-integration:
@./bin/mocha \
--reporter $(REPORTER) \
test/regression/issue*/control.js

test-outputs/issue1327/case-out.json: test/regression/issue1327/case.js
@mkdir -p $(dir $@) || true
@./bin/mocha --reporter json $< > $@ || true

test-failing:
./bin/mocha \
--reporter $(REPORTER) \
test/acceptance/failing > /dev/null 2>&1 ; \
failures="$$?" ; \
if [ "$$failures" != '4' ] ; then \
echo 'test-failing:' ; \
echo " expected 4 failing tests but saw $$failures" ; \
exit 1 ; \
fi
test/integration/*.js

test-compilers:
@./bin/mocha \
Expand Down Expand Up @@ -109,31 +94,6 @@ test-exports:
--ui exports \
test/acceptance/interfaces/exports

test-grep:
@./bin/mocha \
--reporter $(REPORTER) \
--grep fast \
test/acceptance/misc/grep

test-invert:
@./bin/mocha \
--reporter $(REPORTER) \
--grep slow \
--invert \
test/acceptance/misc/grep

test-bail:
@./bin/mocha \
--reporter $(REPORTER) \
--bail \
test/acceptance/misc/bail

test-async-only:
@./bin/mocha \
--reporter $(REPORTER) \
--async-only \
test/acceptance/misc/asyncOnly

test-glob:
@./test/acceptance/glob/glob.sh

Expand All @@ -142,12 +102,6 @@ test-reporters:
--reporter $(REPORTER) \
test/reporters/*.js

test-delay:
@./bin/mocha \
--reporter $(REPORTER) \
--delay \
test/delay/*.js

test-only:
@./bin/mocha \
--reporter $(REPORTER) \
Expand All @@ -164,12 +118,6 @@ test-only:
--ui qunit \
test/acceptance/misc/only/qunit

test-sort:
@./bin/mocha \
--reporter $(REPORTER) \
--sort \
test/acceptance/sort

test-mocha:
@./bin/mocha \
--reporter $(REPORTER) \
Expand Down Expand Up @@ -200,4 +148,4 @@ non-tty:
tm:
@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 non-tty test-grep test-failing tm clean
.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
9 changes: 9 additions & 0 deletions test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
function usedToBeAsync (cb) {
cb()
}

it('test', function() {
this.timeout(4294967296);
usedToBeAsync(done)
});

93 changes: 0 additions & 93 deletions test/acceptance/diffs.js

This file was deleted.

17 changes: 0 additions & 17 deletions test/acceptance/failing/timeout.js

This file was deleted.

9 changes: 0 additions & 9 deletions test/acceptance/misc/asyncOnly.js

This file was deleted.

20 changes: 0 additions & 20 deletions test/acceptance/misc/bail.js

This file was deleted.

57 changes: 0 additions & 57 deletions test/acceptance/misc/cascade.js

This file was deleted.

21 changes: 0 additions & 21 deletions test/acceptance/misc/grep.js

This file was deleted.

23 changes: 0 additions & 23 deletions test/acceptance/multiple.done.js

This file was deleted.

41 changes: 0 additions & 41 deletions test/acceptance/pending.js

This file was deleted.

Loading