diff options
| author | Gregg Caines <[email protected]> | 2013-11-23 07:41:18 -0800 |
|---|---|---|
| committer | Gregg Caines <[email protected]> | 2013-11-23 07:41:18 -0800 |
| commit | 7c7ce93b06d8e2b08ea9107c44dc9d5de4d746ba (patch) | |
| tree | 5ee1c95856a9aae2b762a2ee35bee3d58f25117f | |
| parent | b59caf0606d2ab612cedc62e39a27142b8d7e499 (diff) | |
| download | node-coveralls-7c7ce93b06d8e2b08ea9107c44dc9d5de4d746ba.tar.xz node-coveralls-7c7ce93b06d8e2b08ea9107c44dc9d5de4d746ba.zip | |
fixed merge conflicts in makefile. continuing work to switch coverage tool to istanbul.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | package.json | 9 |
3 files changed, 11 insertions, 16 deletions
@@ -1,3 +1,3 @@ node_modules/ -coverage.html +coverage/ lib-cov/ @@ -2,21 +2,19 @@ REPORTER = spec test: @$(MAKE) lint @echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID) - @$(MAKE) core_test - -core_test: - @NODE_ENV=test ./node_modules/.bin/mocha -b --require blanket --reporter $(REPORTER) + @NODE_ENV=test ./node_modules/.bin/mocha -b --reporter $(REPORTER) lint: ./node_modules/.bin/jshint ./lib ./test ./index.js test-cov: - $(MAKE) test REPORTER=spec - $(MAKE) core_test REPORTER=html-cov > coverage.html + $(MAKE) lint + @NODE_ENV=test ./node_modules/.bin/istanbul cover \ + ./node_modules/mocha/bin/_mocha -- -R spec test-coveralls: - $(MAKE) test REPORTER=spec - $(MAKE) core_test REPORTER=mocha-lcov-reporter | ./bin/coveralls.js --verbose - rm -rf lib-cov + @NODE_ENV=test ./node_modules/.bin/istanbul cover \ + ./node_modules/mocha/bin/_mocha -- \ + REPORTER=mocha-lcov-reporter | ./bin/coveralls.js --verbose .PHONY: test diff --git a/package.json b/package.json index 198a52c..035186b 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,7 @@ "url": "https://github.com/cainus/node-coveralls/issues" }, "scripts": { - "test": "make test", - "blanket": { - "pattern": "lib", - "data-cover-never": "node_modules" - } + "test": "make test" }, "bin": { "coveralls": "./bin/coveralls.js" @@ -27,6 +23,7 @@ "Kir Belevich (https://github.com/svg)", "elliotcable <[email protected]> (http://elliottcable.name/)", "Slotos <[email protected]> (http://slotos.net)", + "mattjmorrison <[email protected]> (http://mattjmorrison.com)", "Arpad Borsos <[email protected]> (http://swatinem.de/)" ], "dependencies": { @@ -36,11 +33,11 @@ "log-driver": "1.2.1" }, "devDependencies": { - "blanket": "~1.1.5", "sinon-restore": "1.0.0", "mocha-lcov-reporter": "0.0.1", "mocha": "1.8.1", "should": "1.1.0", + "istanbul": "0.1.45", "jshint": "2.1.3" }, "engines": { |