This repository was archived by the owner on Sep 3, 2021. It is now read-only.

Commit c230699

committed

fix(coverage): setup

1 parent 1f557c7 commit c230699Copy full SHA for c230699

File tree

+15

-9

lines changed

+15

-9

lines changed

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,24 @@ var _ = require('lodash');`
`6`	`6`	`var karma = require('karma').server;`
`7`	`7`	`var karmaConf = require('./karma.conf.js');`
`8`	`8`
`9`		`-gulp.task('test', function(done) {`
`10`		`- karma.start(_.assign({}, karmaConf, { singleRun: true }), done);`
	`9`	`+gulp.task('test', function (done) {`
	`10`	`+ karma.start({`
	`11`	`+ configFile: __dirname + '/karma.conf.js',`
	`12`	`+ singleRun: true`
	`13`	`+ }, done);`
`11`	`14`	`});`
`12`	`15`
`13`		`-gulp.task('tdd', function(done) {`
`14`		`- karma.start(karmaConf, done);`
	`16`	`+gulp.task('tdd', function (done) {`
	`17`	`+ karma.start({`
	`18`	`+ configFile: __dirname + '/karma.conf.js'`
	`19`	`+ }, done);`
`15`	`20`	`});`
`16`	`21`
`17`	`22`	`gulp.task('jshint', function() {`
`18`		`- return gulp.src('./{controllers,decorators,directives,filters,services}/*.js')`
	`23`	`+ return gulp.src('./{controllers,decorators,directives,E2E,filters,services}/*.js')`
`19`	`24`	`.pipe(jshint())`
`20`	`25`	`.pipe(jshint.reporter(stylish))`
`21`	`26`	`.pipe(jshint.reporter('fail'));`
`22`	`27`	`});`
`23`	`28`
`24`		`-gulp.task('default', ['jshint', 'test']);`
	`29`	`+gulp.task('default', ['jshint', 'test']);`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,13 @@ module.exports = function(config) {`
`43`	`43`	`],`
`44`	`44`
`45`	`45`	`// plugin list`
`46`		`- plugins: ['karma-jasmine','karma-phantomjs-launcher','karma-ng-html2js-preprocessor'],`
	`46`	`+ plugins: ['karma-jasmine','karma-phantomjs-launcher','karma-ng-html2js-preprocessor','karma-coverage'],`
`47`	`47`
`48`	`48`	`// preprocess matching files before serving them to the browser`
`49`	`49`	`// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor`
`50`	`50`	`preprocessors: {`
`51`		`- 'directives/*.html': ['ng-html2js']`
	`51`	`+ 'directives/*.html': ['ng-html2js'],`
	`52`	`+ './{controllers,decorators,directives,E2E,filters,services}/*.js': ['coverage']`
`52`	`53`	`},`
`53`	`54`
`54`	`55`	`// Custom ngHtml2JSPreprocessor options`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"jshint-stylish": "^1.0.1",`
`23`	`23`	`"karma": "^0.12.28",`
`24`	`24`	`"karma-chrome-launcher": "^0.2.0",`
`25`		`- "karma-coverage": "^0.2.7",`
	`25`	`+ "karma-coverage": "^0.4.2",`
`26`	`26`	`"karma-jasmine": "^0.3.3",`
`27`	`27`	`"karma-ng-html2js-preprocessor": "^0.1.2",`
`28`	`28`	`"karma-phantomjs-launcher": "^0.1.4",`

Comments

(0)