diff options
| author | Vojta Jina | 2013-06-25 11:48:10 -0700 |
|---|---|---|
| committer | Vojta Jina | 2013-06-28 11:43:38 -0700 |
| commit | 29f96c852c355d0e283a64111d4923d1bcde8f5f (patch) | |
| tree | fc40a3fec38f8245917b979a6216aa272c8cd5fa /karma-docs.conf.js | |
| parent | 89efb12ed852070a93777c5ff0ed3f9bc822bdf0 (diff) | |
| download | angular.js-29f96c852c355d0e283a64111d4923d1bcde8f5f.tar.bz2 | |
chore: update karma to 0.9.4
And also add shared config to make karma configs a bit simpler.
Diffstat (limited to 'karma-docs.conf.js')
| -rw-r--r-- | karma-docs.conf.js | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/karma-docs.conf.js b/karma-docs.conf.js index 69192509..0403d187 100644 --- a/karma-docs.conf.js +++ b/karma-docs.conf.js @@ -1,36 +1,36 @@ -files = [ - JASMINE, - JASMINE_ADAPTER, +var sharedConfig = require('./karma-shared.conf'); - 'build/docs/components/jquery.js', - 'test/jquery_remove.js', +module.exports = function(config) { + sharedConfig(config); - 'build/angular.js', - 'build/angular-cookies.js', - 'build/angular-mocks.js', - 'build/angular-resource.js', - 'build/angular-mobile.js', - 'build/angular-sanitize.js', - 'build/angular-route.js', + config.set({ + files: [ + 'build/docs/components/jquery.js', + 'test/jquery_remove.js', - 'build/docs/components/lib/lunr.js/lunr.js', - 'build/docs/components/lib/google-code-prettify/src/prettify.js', - 'build/docs/components/showdown.js', + 'build/angular.js', + 'build/angular-cookies.js', + 'build/angular-mocks.js', + 'build/angular-resource.js', + 'build/angular-mobile.js', + 'build/angular-sanitize.js', + 'build/angular-route.js', - 'build/docs/components/angular-bootstrap.js', - 'build/docs/components/angular-bootstrap-prettify.js', - 'build/docs/js/docs.js', - 'build/docs/docs-data.js', + 'build/docs/components/lib/lunr.js/lunr.js', + 'build/docs/components/lib/google-code-prettify/src/prettify.js', + 'build/docs/components/showdown.js', - 'docs/component-spec/*.js' -]; + 'build/docs/components/angular-bootstrap.js', + 'build/docs/components/angular-bootstrap-prettify.js', + 'build/docs/js/docs.js', + 'build/docs/docs-data.js', -autoWatch = true; -logLevel = LOG_INFO; -logColors = true; -browsers = ['Chrome']; + 'docs/component-spec/*.js' + ], -junitReporter = { - outputFile: 'test_out/docs.xml', - suite: 'Docs' + junitReporter: { + outputFile: 'test_out/docs.xml', + suite: 'Docs' + } + }); }; |
