feat(config): allow config to be a default export

karma-runner · Jan 15, 2017 · 9976dce · 9976dce
1 parent 99d647b
commit 9976dce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/config.js b/lib/config.js
@@ -342,6 +342,9 @@ var parseConfig = function (configFilePath, cliOptions) {
 
     try {
       configModule = require(configFilePath)
+      if (typeof configModule === 'object' && typeof configModule.default !== 'undefined') {
+        configModule = configModule.default
+      }
     } catch (e) {
       if (e.code === 'MODULE_NOT_FOUND' && e.message.indexOf(configFilePath) !== -1) {
         log.error('File %s does not exist!', configFilePath)

diff --git a/test/unit/config.spec.js b/test/unit/config.spec.js
@@ -45,7 +45,8 @@ describe('config', () => {
       '/conf/exclude.js': wrapCfg({exclude: ['one.js', 'sub/two.js']}),
       '/conf/absolute.js': wrapCfg({files: ['http://some.com', 'https://more.org/file.js']}),
       '/conf/both.js': wrapCfg({files: ['one.js', 'two.js'], exclude: ['third.js']}),
-      '/conf/coffee.coffee': wrapCfg({files: ['one.js', 'two.js']})
+      '/conf/coffee.coffee': wrapCfg({files: ['one.js', 'two.js']}),
+      '/conf/default-export.js': {default: wrapCfg({files: ['one.js', 'two.js']})}
     }
 
     // load file under test
@@ -294,6 +295,11 @@ describe('config', () => {
       config = normalizeConfigWithDefaults({ protocol: 'unsupported:' })
       expect(config.protocol).to.equal('http:')
     })
+
+    it('should allow the config to be set of the default export', () => {
+      var config = e.parseConfig('/conf/default-export.js', {})
+      expect(config.autoWatch).to.equal(true)
+    })
   })
 
   describe('normalizeConfig', () => {