From 3d9dc2cba502a56e508fa2e79f1f49b385a8b683 Mon Sep 17 00:00:00 2001 From: Jackson Tian Date: Fri, 17 May 2013 17:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=A6=86=E7=9B=96=E7=8E=87=E6=94=B9?= =?UTF-8?q?=E4=B8=BAblanket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 15 +++++++-------- index.js | 2 +- package.json | 16 +++++++++++++--- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 11d6f13..1c39ba9 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,19 @@ TESTS = test/test.js REPORTER = spec TIMEOUT = 10000 -JSCOVERAGE = ./node_modules/jscover/bin/jscover +MOCHA_OPTS = test: @NODE_ENV=test ./node_modules/mocha/bin/mocha \ --reporter $(REPORTER) \ --timeout $(TIMEOUT) \ + $(MOCHA_OPTS) \ $(TESTS) -test-cov: lib-cov - @EVENTPROXY_COV=1 $(MAKE) test REPORTER=dot - @EVENTPROXY_COV=1 $(MAKE) test REPORTER=html-cov > coverage.html +test-cov: + @$(MAKE) test MOCHA_OPTS='--require blanket' REPORTER=html-cov > coverage.html + @$(MAKE) test MOCHA_OPTS='--require blanket' REPORTER=travis-cov -lib-cov: - @rm -rf $@ - @$(JSCOVERAGE) lib $@ +test-all: test test-cov -.PHONY: test test-cov lib-cov \ No newline at end of file +.PHONY: test test-cov test-all diff --git a/index.js b/index.js index 38eb710..490f48f 100755 --- a/index.js +++ b/index.js @@ -1 +1 @@ -module.exports = process.env.EVENTPROXY_COV ? require('./lib-cov/eventproxy') : require('./lib/eventproxy'); +module.exports = require('./lib/eventproxy'); diff --git a/package.json b/package.json index 71eaaba..1d10648 100755 --- a/package.json +++ b/package.json @@ -16,12 +16,22 @@ "dependencies": {}, "devDependencies": { "mocha": "*", - "jscover": "*", + "blanket": "*", "pedding": "*", - "chai": "*" + "chai": "*", + "travis-cov": "*" }, "scripts": { - "test": "make test" + "test": "make test-all", + "blanket": { + "pattern": "eventproxy/lib", + "data-cover-flags": { + "debug": false + } + }, + "travis-cov": { + "threshold": 70 + } }, "repository": { "type": "git",