Make tests work with karma-cli (#6840)

diff --git a/gulpfile.js b/gulpfile.js
index 7ce62447a265164fbe2ca51b04254081263105d0..b5e68217e7ee05351ad14d8a111dab0fd806e860 100644 (file)
--- 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 884ac841d35f6056ee05a0102d42371fb3e0d3c0..a89d3fba2248f8366a31907dcb13d86dd7fdf5b6 100644 (file)
--- 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'],