Skip to content

Commit

Permalink
OK.
Browse files Browse the repository at this point in the history
  • Loading branch information
eiriksm committed Oct 8, 2014
1 parent 5d8fb92 commit e461c26
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ node_js:

script:
- make ci
- cat ./coverage/*/lcov.info | ./node_modules/coveralls/bin/coveralls.js > /dev/null 2>&1
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js > /dev/null 2>&1

before_script:
- npm i -g npm
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ test:

test-cov:
./node_modules/istanbul/lib/cli.js cover -- ./node_modules/mocha/bin/_mocha -R spec
./node_modules/istanbul/lib/cli.js check-coverage
#./node_modules/istanbul/lib/cli.js check-coverage --statements=100 --functions=100 --branches=100 --lines=100

ci:
make test-cov
./node_modules/.bin/jshint
#./node_modules/.bin/jshint *.*


.PHONY: test test-cov ci
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"test": "test"
},
"scripts": {
"test": "mocha"
"test": "mocha",
"ci": "make ci"
},
"repository": {
"type": "git",
Expand All @@ -24,9 +25,13 @@
"istanbul": "^0.3.2",
"jshint": "^2.5.6",
"mocha": "^1.21.4",
"pre-commit": "0.0.9",
"should": "^4.0.4",
"supertest": "^0.14.0"
},
"pre-commit": [
"ci"
],
"dependencies": {
"express": "^4.9.5"
}
Expand Down
4 changes: 2 additions & 2 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ function gtoa(og, sg) {
if (!og || !sg) {
throw new Error('Givem me values plz');
}
return (og - sg) * 131;
}
return (og - sg) * 131
};

var express = require('express');
var app = express();
Expand Down

0 comments on commit e461c26

Please sign in to comment.