Skip to content

Commit

Permalink
Merge pull request #240 from edgarmueller/master
Browse files Browse the repository at this point in the history
Fix #238 (coveralls setup)
  • Loading branch information
edgarmueller committed Apr 28, 2016
2 parents 9afe2b5 + 51db8f5 commit 2d7bb6c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ install:
- npm install

script:
- npm run test
- npm run test && cat ./reports/coverage/lcov-report/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
10 changes: 3 additions & 7 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,13 @@ module.exports = function (config) {
coverageReporter: {
reporters: [
{
dir: 'reports/coverage/',
dir: 'reports/coverage/html-report',
subdir: '.',
type: 'html'
},{
dir: 'reports/coverage/',
subdir: '.',
type: 'cobertura'
}, {
dir: 'reports/coverage/',
dir: 'reports/coverage/lcov-report',
subdir: '.',
type: 'json'
type: 'lcov'
}
]
}
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"browser-sync": "2.11.1",
"browser-sync-webpack-plugin": "1.0.1",
"compression-webpack-plugin": "0.3.0",
"coveralls": "^2.11.9",
"css-loader": "^0.23.1",
"exports-loader": "^0.6.3",
"extract-text-webpack-plugin": "^1.0.1",
Expand Down

0 comments on commit 2d7bb6c

Please sign in to comment.