Skip to content

Commit

Permalink
Merge pull request #1775 from budde377/feature-add-to-default-lookup-…
Browse files Browse the repository at this point in the history
…path

Feature add .config/karma.config.js to default lookup path
  • Loading branch information
dignifiedquire committed Jan 4, 2016
2 parents dd604d9 + 1617996 commit f176109
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
10 changes: 10 additions & 0 deletions docs/config/01-configuration-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ Note: Most of the framework adapters, reporters, preprocessors and launchers nee


The Karma configuration file can be written in JavaScript or CoffeeScript and is loaded as a regular Node.js module.

Unless provided as argument, the Karma CLI will look for a configuration file at

* `./karma.conf.js`
* `./karma.conf.coffee`
* `./.config/karma.conf.js`
* `./.config/karma.conf.coffee`

in that order.

Within the configuration file, the configuration code is put together by setting `module.exports` to point to a function
which accepts one argument: the configuration object.

Expand Down
4 changes: 4 additions & 0 deletions lib/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ var processArgs = function (argv, options, fs, path) {
configFile = './karma.conf.js'
} else if (fs.existsSync('./karma.conf.coffee')) {
configFile = './karma.conf.coffee'
} else if (fs.existsSync('./.config/karma.conf.js')) {
configFile = './.config/karma.conf.js'
} else if (fs.existsSync('./.config/karma.conf.coffee')) {
configFile = './.config/karma.conf.coffee'
}
}

Expand Down

0 comments on commit f176109

Please sign in to comment.