Merge pull request #446 from targos/upgrade-should

deps: upgrade should, install should-http
This commit is contained in:
Yiyu He 2015-05-24 20:28:40 +08:00
commit 0ad06c9810
2 changed files with 7 additions and 4 deletions

View File

@ -12,6 +12,8 @@ ifeq (node, $(BIN))
FLAGS = --harmony-generators FLAGS = --harmony-generators
endif endif
REQUIRED = --require should --require should-http
TESTS = test/application \ TESTS = test/application \
test/context/* \ test/context/* \
test/request/* \ test/request/* \
@ -21,7 +23,7 @@ TESTS = test/application \
test: test:
@NODE_ENV=test $(BIN) $(FLAGS) \ @NODE_ENV=test $(BIN) $(FLAGS) \
./node_modules/.bin/_mocha \ ./node_modules/.bin/_mocha \
--require should \ $(REQUIRED) \
$(TESTS) \ $(TESTS) \
--bail --bail
@ -30,7 +32,7 @@ test-cov:
./node_modules/.bin/istanbul cover \ ./node_modules/.bin/istanbul cover \
./node_modules/.bin/_mocha \ ./node_modules/.bin/_mocha \
-- -u exports \ -- -u exports \
--require should \ $(REQUIRED) \
$(TESTS) \ $(TESTS) \
--bail --bail
@ -40,7 +42,7 @@ test-travis:
./node_modules/.bin/_mocha \ ./node_modules/.bin/_mocha \
--report lcovonly \ --report lcovonly \
-- -u exports \ -- -u exports \
--require should \ $(REQUIRED) \
$(TESTS) \ $(TESTS) \
--bail --bail

View File

@ -47,7 +47,8 @@
"istanbul-harmony": "~0.3.0", "istanbul-harmony": "~0.3.0",
"make-lint": "^1.0.1", "make-lint": "^1.0.1",
"mocha": "^2.0.1", "mocha": "^2.0.1",
"should": "^3.1.0", "should": "^6.0.3",
"should-http": "0.0.3",
"supertest": "^1.0.1", "supertest": "^1.0.1",
"test-console": "^0.7.1" "test-console": "^0.7.1"
}, },