Skip to content

Commit 869b62a

Browse files
committed
karmaKickoff
1 parent 72da8cc commit 869b62a

File tree

7 files changed

+30
-42
lines changed

7 files changed

+30
-42
lines changed

Gruntfile.coffee

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
log = require('util').log
22
_ = require 'lodash'
3-
karmaRunner = require './grunt/karma'
3+
kickoff = require 'karma-kickoff'
44
argv = require('yargs').argv
55

66
module.exports = (grunt) ->
@@ -130,10 +130,17 @@ module.exports = (grunt) ->
130130
grunt.registerTask 's', 'server'
131131

132132
grunt.registerTask 'karma', 'karma runner', ->
133-
karmaRunner(grunt) @async()
133+
kickoff @async(),
134+
logFn: grunt.log.oklns
135+
configFile: require.resolve './karma.conf.coffee'
134136

135137
grunt.registerTask 'karmaSpecific', 'karma runner', ->
136-
karmaRunner(grunt, files: argv.files) @async()
138+
kickoff @async(),
139+
configFile: require.resolve './karma.conf.coffee'
140+
logFn: grunt.log.oklns
141+
appendFiles: argv.files.split(',')
142+
lengthToPop: 1
143+
reporters: ['mocha']
137144

138145
grunt.registerTask 'karmaB', ['build', 'karmaSpecific']
139146
grunt.registerTask 'karmaSpecB', ['build', 'karma']

dist/angular-google-maps-street-view.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.3.0 2016-01-24
1+
/*! angular-google-maps 2.3.0 2016-01-28
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/

dist/angular-google-maps-street-view.min.js

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.3.0 2016-01-24
1+
/*! angular-google-maps 2.3.0 2016-01-28
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/

dist/angular-google-maps.min.js

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

grunt/karma.coffee

Lines changed: 0 additions & 36 deletions
This file was deleted.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
"karma-phantomjs-launcher": "0.2.X",
6767
"mocha": "2.X",
6868
"webpack": "^1.9.10",
69-
"yargs": "3.32.0"
69+
"yargs": "3.32.0",
70+
"karma-kickoff": "0.0.X"
7071
},
7172
"dependencies": {
7273
"angular": "1.2 - 1.4",

0 commit comments

Comments
 (0)