Merge pull request #1675 from danielstjules/integration-tests

Add integration tests

Makefile

@@ -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
@@ -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 \
@@ -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
 
@@ -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) \
@@ -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) \
@@ -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

test.js

@@ -0,0 +1,9 @@
+function usedToBeAsync (cb) {
+  cb()
+}
+
+it('test', function() {
+  this.timeout(4294967296);
+  usedToBeAsync(done)
+});
+