Commit 37464ad1 by Clinton Blackburn

Reporting JS coverage alongside Python

XCOM-567
parent 620f99b9
...@@ -7,10 +7,15 @@ sudo: false ...@@ -7,10 +7,15 @@ sudo: false
cache: cache:
directories: directories:
- $HOME/.cache/pip - $HOME/.cache/pip
addons:
apt:
packages:
- lcov
before_install: before_install:
- "export DISPLAY=:99.0" - "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start" - "sh -e /etc/init.d/xvfb start"
install: install:
- gem install coveralls-lcov
- pip install -r requirements/test.txt - pip install -r requirements/test.txt
- pip install coveralls - pip install coveralls
- make requirements.js - make requirements.js
...@@ -21,4 +26,5 @@ branches: ...@@ -21,4 +26,5 @@ branches:
only: only:
- master - master
after_success: after_success:
coveralls - coveralls-lcov -v -n coverage/report-lcov/lcov.info > js-coverage.json
- coveralls --merge=js-coverage.json
...@@ -41,9 +41,10 @@ serve: ...@@ -41,9 +41,10 @@ serve:
clean: clean:
find . -name '*.pyc' -delete find . -name '*.pyc' -delete
coverage erase coverage erase
rm -rf assets/ ecommerce/static/build rm -rf assets/ ecommerce/static/build coverage
validate_js: validate_js:
rm -rf coverage
gulp test gulp test
gulp lint gulp lint
gulp jscs gulp jscs
......
...@@ -46,7 +46,10 @@ module.exports = function(config) { ...@@ -46,7 +46,10 @@ module.exports = function(config) {
// Karma coverage config // Karma coverage config
coverageReporter: { coverageReporter: {
type : 'text' reporters: [
{type: 'text'},
{ type: 'lcov', subdir: 'report-lcov' }
]
}, },
// test results reporter to use // test results reporter to use
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment