File tree 4 files changed +30
-18
lines changed
4 files changed +30
-18
lines changed Original file line number Diff line number Diff line change @@ -14,4 +14,4 @@ before_script:
14
14
- npm install -g bower grunt-cli
15
15
- bower install
16
16
17
- script : " grunt karma --verbose"
17
+ script : " grunt --verbose"
Original file line number Diff line number Diff line change @@ -8,7 +8,11 @@ module.exports = function (grunt) {
8
8
9
9
var testConfig = function ( configFile , customOptions ) {
10
10
var options = { configFile : configFile , keepalive : true } ;
11
- var travisOptions = process . env . TRAVIS && { browsers : [ 'Firefox' ] , reporters : 'dots' } ;
11
+ var travisOptions = process . env . TRAVIS && {
12
+ browsers : [ 'Firefox' ] ,
13
+ reporters : [ 'dots' , 'coverage' ] ,
14
+ singleRun : true
15
+ } ;
12
16
return grunt . util . _ . extend ( options , customOptions , travisOptions ) ;
13
17
} ;
14
18
@@ -28,15 +32,12 @@ module.exports = function (grunt) {
28
32
} ,
29
33
karma : {
30
34
unit : {
31
- options : testConfig ( 'karma.conf.js' )
32
- } ,
33
- watch : {
34
35
options : testConfig ( 'karma.conf.js' ,
35
36
{
36
37
singleRun : false ,
37
38
autoWatch : true ,
38
39
keepalive : true ,
39
- browsers : [ 'PhantomJS ' ]
40
+ browsers : [ 'Chrome ' ]
40
41
} )
41
42
}
42
43
} ,
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ module.exports = function (config) {
27
27
] ,
28
28
29
29
files : [
30
- 'bower_components/jquery/jquery.js' ,
30
+ 'bower_components/jquery/dist/ jquery.js' ,
31
31
'bower_components/moment/moment.js' ,
32
32
'bower_components/bootstrap/dist/js/bootstrap.js' ,
33
33
'bower_components/angular/angular.js' ,
@@ -45,6 +45,12 @@ module.exports = function (config) {
45
45
'**/src/js/*.js' : [ 'coverage' ]
46
46
} ,
47
47
48
+ // optionally, configure the reporter
49
+ coverageReporter : {
50
+ type : 'html' ,
51
+ dir : 'coverage/'
52
+ } ,
53
+
48
54
// test results reporter to use
49
55
// possible values: 'dots', 'progress', 'junit'
50
56
reporters : [ 'progress' , 'coverage' ] ,
@@ -87,6 +93,6 @@ module.exports = function (config) {
87
93
88
94
// Continuous Integration mode
89
95
// if true, it capture browsers, run tests and exit
90
- singleRun : true
96
+ singleRun : false
91
97
} ) ;
92
98
} ;
Original file line number Diff line number Diff line change 6
6
"license" : " MIT" ,
7
7
"homepage" : " http://dalelotts.github.io/angular-bootstrap-datetimepicker" ,
8
8
"main" : " src/js/datetimepicker.js" ,
9
- "dependencies" : {
10
- },
9
+ "dependencies" : {},
11
10
"devDependencies" : {
12
11
"bower" : " latest" ,
13
- "grunt" : " 0.4.1" ,
14
- "grunt-cli" : " 0.1.10" ,
15
- "grunt-contrib-jshint" : " 0.6.4" ,
16
- "grunt-istanbul-coverage" : " 0.0.2" ,
17
- "grunt-karma" : " 0.6.2" ,
18
- "karma-coverage" : " 0.1.0" ,
19
- "karma-phantomjs-launcher" : " ~0.1" ,
20
- "matchdep" : " 0.1.2" ,
12
+ "grunt" : " 0.4.4" ,
13
+
14
+ "grunt-contrib-jshint" : " 0.9.2" ,
15
+ "grunt-istanbul-coverage" : " 0.0.3" ,
16
+ "grunt-karma" : " 0.8.2" ,
17
+ "karma-chrome-launcher" : " ^0.1.2" ,
18
+ "karma-coverage" : " 0.2.1" ,
19
+ "karma-firefox-launcher" : " ^0.1.3" ,
20
+ "karma-jasmine" : " ^0.1.5" ,
21
+ "karma-phantomjs-launcher" : " 0.1.2" ,
22
+ "matchdep" : " 0.3.0" ,
21
23
"phantomjs" : " ^1.9.7-1"
22
24
},
25
+ "peerDependencies" : {
26
+ "grunt-cli" : " 0.1.13"
27
+ },
23
28
"scripts" : {
24
29
"test" : " grunt --verbose" ,
25
30
"postinstall" : " ./node_modules/bower/bin/bower install"
You can’t perform that action at this time.
0 commit comments