File tree Expand file tree Collapse file tree 5 files changed +14
-1
lines changed
Expand file tree Collapse file tree 5 files changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ var gulp = require('gulp'),
66
77var yargs = require ( '../lib/util/yargs' ) ,
88 jshintReporter = require ( '../lib/util/jshint-reporter' ) ,
9+ karma = require ( '../lib/test/karma' ) ,
910 hr = require ( '../lib/util/hr' ) ;
1011
1112yargs . getInstance ( 'build' )
@@ -24,9 +25,11 @@ yargs.getInstance('build')
2425 default : false
2526 } )
2627 . options ( jshintReporter . yargsOption . key , jshintReporter . yargsOption . value )
28+ . options ( karma . yargsOption . key , karma . yargsOption . value )
2729 . strict ( )
2830 . check ( yargs . subCommandCheck )
2931 . check ( jshintReporter . yargsCheck )
32+ . check ( karma . yargsCheck )
3033 . wrap ( 80 ) ;
3134
3235gulp . task ( 'build' , function ( done ) {
Original file line number Diff line number Diff line change @@ -42,9 +42,11 @@ yargs.getInstance('javascript')
4242 default : false ,
4343 } )
4444 . options ( jshintReporter . yargsOption . key , jshintReporter . yargsOption . value )
45+ . options ( karma . yargsOption . key , karma . yargsOption . value )
4546 . strict ( )
4647 . check ( yargs . subCommandCheck )
4748 . check ( jshintReporter . yargsCheck )
49+ . check ( karma . yargsCheck )
4850 . wrap ( 80 ) ;
4951
5052//TODO @bguiz jsHintReporter module should only need to be imported by this module
@@ -117,7 +119,6 @@ gulp.task('javascript:lint', function () {
117119gulp . task ( 'javascript:unit' , function ( ) {
118120 var reporters = cliArgs . karmareporter ;
119121 if ( reporters . constructor === Array ) {
120- reporters = Array ;
121122 }
122123 else if ( typeof reporters === 'string' &&
123124 reporters !== karma . yargsOption . value . default ) {
Original file line number Diff line number Diff line change @@ -17,6 +17,7 @@ var injectAdjacent = require('../lib/inject/adjacent-files'),
1717 yargs = require ( '../lib/util/yargs' ) ,
1818 hr = require ( '../lib/util/hr' ) ,
1919 jshintReporter = require ( '../lib/util/jshint-reporter' ) ,
20+ karma = require ( '../lib/test/karma' ) ,
2021 streams = require ( '../lib/config/streams' ) ;
2122
2223yargs . getInstance ( 'release' )
@@ -36,9 +37,11 @@ yargs.getInstance('release')
3637 default : false
3738 } )
3839 . options ( jshintReporter . yargsOption . key , jshintReporter . yargsOption . value )
40+ . options ( karma . yargsOption . key , karma . yargsOption . value )
3941 . strict ( )
4042 . check ( yargs . subCommandCheck )
4143 . check ( jshintReporter . yargsCheck )
44+ . check ( karma . yargsCheck )
4245 . wrap ( 80 ) ;
4346
4447gulp . task ( 'release' , [ 'build' ] , function ( done ) {
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ var defaults = require('../lib/config/defaults'),
99 yargs = require ( '../lib/util/yargs' ) ,
1010 hr = require ( '../lib/util/hr' ) ,
1111 jshintReporter = require ( '../lib/util/jshint-reporter' ) ,
12+ karma = require ( '../lib/test/karma' ) ,
1213 streams = require ( '../lib/config/streams' ) ;
1314
1415var cliArgs ;
@@ -56,10 +57,12 @@ yargs.getInstance('server')
5657 default : config . get ( 'port' )
5758 } )
5859 . options ( jshintReporter . yargsOption . key , jshintReporter . yargsOption . value )
60+ . options ( karma . yargsOption . key , karma . yargsOption . value )
5961 . strict ( )
6062 . check ( yargs . subCommandCheck )
6163 . check ( check )
6264 . check ( jshintReporter . yargsCheck )
65+ . check ( karma . yargsCheck )
6366 . wrap ( 80 ) ;
6467
6568gulp . task ( 'server' , [ 'build' ] , function ( ) {
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ var defaults = require('../lib/config/defaults'),
99 yargs = require ( '../lib/util/yargs' ) ,
1010 hr = require ( '../lib/util/hr' ) ,
1111 jshintReporter = require ( '../lib/util/jshint-reporter' ) ,
12+ karma = require ( '../lib/test/karma' ) ,
1213 streams = require ( '../lib/config/streams' ) ;
1314
1415var config = defaults . getInstance ( )
@@ -55,10 +56,12 @@ yargs.getInstance('watch')
5556 default : config . get ( 'port' )
5657 } )
5758 . options ( jshintReporter . yargsOption . key , jshintReporter . yargsOption . value )
59+ . options ( karma . yargsOption . key , karma . yargsOption . value )
5860 . strict ( )
5961 . check ( yargs . subCommandCheck )
6062 . check ( check )
6163 . check ( jshintReporter . yargsCheck )
64+ . check ( karma . yargsCheck )
6265 . wrap ( 80 ) ;
6366
6467gulp . task ( 'watch' , [ 'server' ] , function ( ) {
You can’t perform that action at this time.
0 commit comments