From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 17 Dec 2019 19:18:19 +0000 (-0800)
Subject: Make tests work with karma-cli (#6840)
X-Git-Tag: v3.0.0-alpha~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33f08f53b5b036ed48168bfed62d868e8ab99b67;p=thirdparty%2FChart.js.git

Make tests work with karma-cli (#6840)
---

diff --git a/gulpfile.js b/gulpfile.js
index 7ce62447a..b5e68217e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -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
     }
   },
diff --git a/karma.conf.js b/karma.conf.js
index 884ac841d..a89d3fba2 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -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'],