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'),
6
6
7
7
var yargs = require ( '../lib/util/yargs' ) ,
8
8
jshintReporter = require ( '../lib/util/jshint-reporter' ) ,
9
+ karma = require ( '../lib/test/karma' ) ,
9
10
hr = require ( '../lib/util/hr' ) ;
10
11
11
12
yargs . getInstance ( 'build' )
@@ -24,9 +25,11 @@ yargs.getInstance('build')
24
25
default : false
25
26
} )
26
27
. options ( jshintReporter . yargsOption . key , jshintReporter . yargsOption . value )
28
+ . options ( karma . yargsOption . key , karma . yargsOption . value )
27
29
. strict ( )
28
30
. check ( yargs . subCommandCheck )
29
31
. check ( jshintReporter . yargsCheck )
32
+ . check ( karma . yargsCheck )
30
33
. wrap ( 80 ) ;
31
34
32
35
gulp . task ( 'build' , function ( done ) {
Original file line number Diff line number Diff line change @@ -42,9 +42,11 @@ yargs.getInstance('javascript')
42
42
default : false ,
43
43
} )
44
44
. options ( jshintReporter . yargsOption . key , jshintReporter . yargsOption . value )
45
+ . options ( karma . yargsOption . key , karma . yargsOption . value )
45
46
. strict ( )
46
47
. check ( yargs . subCommandCheck )
47
48
. check ( jshintReporter . yargsCheck )
49
+ . check ( karma . yargsCheck )
48
50
. wrap ( 80 ) ;
49
51
50
52
//TODO @bguiz jsHintReporter module should only need to be imported by this module
@@ -117,7 +119,6 @@ gulp.task('javascript:lint', function () {
117
119
gulp . task ( 'javascript:unit' , function ( ) {
118
120
var reporters = cliArgs . karmareporter ;
119
121
if ( reporters . constructor === Array ) {
120
- reporters = Array ;
121
122
}
122
123
else if ( typeof reporters === 'string' &&
123
124
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'),
17
17
yargs = require ( '../lib/util/yargs' ) ,
18
18
hr = require ( '../lib/util/hr' ) ,
19
19
jshintReporter = require ( '../lib/util/jshint-reporter' ) ,
20
+ karma = require ( '../lib/test/karma' ) ,
20
21
streams = require ( '../lib/config/streams' ) ;
21
22
22
23
yargs . getInstance ( 'release' )
@@ -36,9 +37,11 @@ yargs.getInstance('release')
36
37
default : false
37
38
} )
38
39
. options ( jshintReporter . yargsOption . key , jshintReporter . yargsOption . value )
40
+ . options ( karma . yargsOption . key , karma . yargsOption . value )
39
41
. strict ( )
40
42
. check ( yargs . subCommandCheck )
41
43
. check ( jshintReporter . yargsCheck )
44
+ . check ( karma . yargsCheck )
42
45
. wrap ( 80 ) ;
43
46
44
47
gulp . 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'),
9
9
yargs = require ( '../lib/util/yargs' ) ,
10
10
hr = require ( '../lib/util/hr' ) ,
11
11
jshintReporter = require ( '../lib/util/jshint-reporter' ) ,
12
+ karma = require ( '../lib/test/karma' ) ,
12
13
streams = require ( '../lib/config/streams' ) ;
13
14
14
15
var cliArgs ;
@@ -56,10 +57,12 @@ yargs.getInstance('server')
56
57
default : config . get ( 'port' )
57
58
} )
58
59
. options ( jshintReporter . yargsOption . key , jshintReporter . yargsOption . value )
60
+ . options ( karma . yargsOption . key , karma . yargsOption . value )
59
61
. strict ( )
60
62
. check ( yargs . subCommandCheck )
61
63
. check ( check )
62
64
. check ( jshintReporter . yargsCheck )
65
+ . check ( karma . yargsCheck )
63
66
. wrap ( 80 ) ;
64
67
65
68
gulp . task ( 'server' , [ 'build' ] , function ( ) {
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ var defaults = require('../lib/config/defaults'),
9
9
yargs = require ( '../lib/util/yargs' ) ,
10
10
hr = require ( '../lib/util/hr' ) ,
11
11
jshintReporter = require ( '../lib/util/jshint-reporter' ) ,
12
+ karma = require ( '../lib/test/karma' ) ,
12
13
streams = require ( '../lib/config/streams' ) ;
13
14
14
15
var config = defaults . getInstance ( )
@@ -55,10 +56,12 @@ yargs.getInstance('watch')
55
56
default : config . get ( 'port' )
56
57
} )
57
58
. options ( jshintReporter . yargsOption . key , jshintReporter . yargsOption . value )
59
+ . options ( karma . yargsOption . key , karma . yargsOption . value )
58
60
. strict ( )
59
61
. check ( yargs . subCommandCheck )
60
62
. check ( check )
61
63
. check ( jshintReporter . yargsCheck )
64
+ . check ( karma . yargsCheck )
62
65
. wrap ( 80 ) ;
63
66
64
67
gulp . task ( 'watch' , [ 'server' ] , function ( ) {
You can’t perform that action at this time.
0 commit comments