From 33f9997b30847688178643705c1a5766126cf139 Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Tue, 17 Feb 2015 14:00:27 -0800 Subject: [PATCH 1/4] Default to using dots reporter --- gulpfile.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 0b30b6d..e6ec277 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -96,8 +96,7 @@ gulp.task('test:unit', function (done) { karma.start({ configFile: __dirname + '/karma.conf.js', singleRun: true, - autoWatch: false, - reporters: ['dots'] + autoWatch: false }, done); }); @@ -106,8 +105,7 @@ gulp.task('test:unit:tdd', function (done) { karma.start({ configFile: __dirname + '/karma.conf.js', singleRun: false, - autoWatch: true, - reporters: ['dots'] + autoWatch: true }, done); }); From c7c21dccdb311dccdbd72b51dff14f68a2a889fa Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Tue, 17 Feb 2015 14:03:28 -0800 Subject: [PATCH 2/4] Use istanbul to measure karma code coverage Notes: - browserify-istanbul is used instead of a karma-coverage preprocessor because of this bug: https://github.com/karma-runner/karma-coverage/issues/16#issuecomment-62091196 - karma-coverage version pinned to 0.2.6 to workaround this bug: https://github.com/karma-runner/karma-coverage/issues/123#issuecomment-68278237 --- .gitignore | 1 + karma.conf.js | 16 ++++++++++++++-- package.json | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 32c57f2..2d3dc70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea +coverage node_modules server/datasources.local.json server/model-config.local.json \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index 6db143d..8917667 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,6 +1,8 @@ // Karma configuration // Generated on Sun Jan 18 2015 21:07:20 GMT-0800 (PST) +var istanbul = require('browserify-istanbul'); + module.exports = function(config) { config.set({ @@ -32,7 +34,9 @@ module.exports = function(config) { browserify: { debug: true, - transform: ['brfs'], + transform: ['brfs', istanbul({ + ignore: ['**/node_modules/**', '**/spec/**'], + })], bundleDelay: 1000 }, @@ -40,7 +44,15 @@ module.exports = function(config) { // test results reporter to use // possible values: 'dots', 'progress' // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['dots'], + reporters: ['coverage', 'dots'], + + + coverageReporter: { + reporters: [ + {type: 'html'}, + {type: 'cobertura'}, + ], + }, // web server port diff --git a/package.json b/package.json index 48f4df2..fb77302 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "loopback-explorer": "^1.1.0" }, "devDependencies": { + "browserify-istanbul": "^0.1.5", "frisby": "git+https://github.com/vlucas/frisby.git", "gulp": "^3.8.10", "gulp-develop-server": "^0.2.5", @@ -52,6 +53,7 @@ "karma": "^0.12.31", "karma-browserify": "^2.0.0", "karma-chrome-launcher": "^0.1.7", + "karma-coverage": "^0.2.6", "karma-jasmine": "^0.3.5", "strongloop": "^2.10.2" } From f1b129b1571165b285262f1b40b14a1e1f1a3009 Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Tue, 17 Feb 2015 14:23:18 -0800 Subject: [PATCH 3/4] Enable coveralls karma reporter --- karma.conf.js | 4 ++-- package.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 8917667..2af6058 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -44,13 +44,13 @@ module.exports = function(config) { // test results reporter to use // possible values: 'dots', 'progress' // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['coverage', 'dots'], + reporters: ['coverage', 'coveralls', 'dots'], coverageReporter: { reporters: [ {type: 'html'}, - {type: 'cobertura'}, + {type: 'lcov'}, ], }, diff --git a/package.json b/package.json index fb77302..de248d6 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "karma-browserify": "^2.0.0", "karma-chrome-launcher": "^0.1.7", "karma-coverage": "^0.2.6", + "karma-coveralls": "^0.1.5", "karma-jasmine": "^0.3.5", "strongloop": "^2.10.2" } From cae74576413837f9e9f8d6193b8ad94ee1953cb5 Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Wed, 18 Feb 2015 09:48:03 -0800 Subject: [PATCH 4/4] Use shields.io for badges --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c9209fe..461d94c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ Learning Management System for Neukinnis ======================================== +[![Build Status](https://img.shields.io/travis/startersacademy/fullstack-project-01/master.svg)](https://travis-ci.org/startersacademy/fullstack-project-01) +[![Coverage Status](https://img.shields.io/coveralls/startersacademy/fullstack-project-01/master.svg)](https://coveralls.io/r/startersacademy/fullstack-project-01) [![Stories in Ready](https://badge.waffle.io/startersacademy/fullstack-project-01.svg?label=ready&title=Ready)](http://waffle.io/startersacademy/fullstack-project-01) -[![Build Status](https://travis-ci.org/startersacademy/fullstack-project-01.svg?branch=master)](https://travis-ci.org/startersacademy/fullstack-project-01) -[![Coverage Status](https://coveralls.io/repos/startersacademy/fullstack-project-01/badge.svg)](https://coveralls.io/r/startersacademy/fullstack-project-01) Requirements ------------