Skip to content

Commit

Permalink
Merge pull request #1279 from balderdashy/test-fixes
Browse files Browse the repository at this point in the history
fixes from #1113
  • Loading branch information
particlebanana committed Jan 18, 2016
2 parents 0bda03f + a8e709f commit abcb0e3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ test-unit:
test-integration:
@echo "\nRunning integration tests..."
rm -rf node_modules/waterline-adapter-tests/node_modules/waterline;
ln -s $(ROOT) node_modules/waterline-adapter-tests/node_modules/waterline;
ln -s "$(ROOT)" node_modules/waterline-adapter-tests/node_modules/waterline;
@NODE_ENV=test node test/adapter/runner.js

coverage:
@echo "\n\nRunning coverage report..."
rm -rf coverage
./node_modules/istanbul/lib/cli.js cover --report none --dir coverage/core ./node_modules/.bin/_mocha \
@NODE_ENV=test ./node_modules/istanbul/lib/cli.js cover --report none --dir coverage/core ./node_modules/.bin/_mocha \
test/integration test/structure test/support test/unit -- --recursive
./node_modules/istanbul/lib/cli.js cover --report none --dir coverage/adapter test/adapter/runner.js
./node_modules/istanbul/lib/cli.js report
Expand Down

0 comments on commit abcb0e3

Please sign in to comment.