mirror of
https://github.com/chartjs/Chart.js.git
synced 2024-10-06 04:09:08 +02:00
Make tests work with karma-cli (#6840)
This commit is contained in:
parent
c8bdca62e8
commit
33f08f53b5
@ -157,8 +157,8 @@ function unittestTask(done) {
|
||||
singleRun: !argv.watch,
|
||||
args: {
|
||||
coverage: !!argv.coverage,
|
||||
inputs: (argv.inputs || 'test/specs/**/*.js').split(';'),
|
||||
browsers: (argv.browsers || 'chrome,firefox').split(','),
|
||||
inputs: argv.inputs,
|
||||
browsers: argv.browsers,
|
||||
watch: argv.watch
|
||||
}
|
||||
},
|
||||
|
@ -22,7 +22,7 @@ module.exports = function(karma) {
|
||||
karma.set({
|
||||
frameworks: ['jasmine'],
|
||||
reporters: ['progress', 'kjhtml'],
|
||||
browsers: args.browsers,
|
||||
browsers: (args.browsers || 'chrome,firefox').split(','),
|
||||
logLevel: karma.LOG_WARN,
|
||||
|
||||
// Explicitly disable hardware acceleration to make image
|
||||
@ -56,7 +56,7 @@ module.exports = function(karma) {
|
||||
'node_modules/moment/min/moment.min.js',
|
||||
'test/index.js',
|
||||
'src/index.js'
|
||||
].concat(args.inputs),
|
||||
].concat((args.inputs || 'test/specs/**/*.js').split(';')),
|
||||
|
||||
preprocessors: {
|
||||
'test/index.js': ['rollup'],
|
||||
|
Loading…
Reference in New Issue
Block a user