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-jqlite.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-jqlite.conf.js')
| -rw-r--r-- | karma-jqlite.conf.js | 22 | 
1 files changed, 12 insertions, 10 deletions
| diff --git a/karma-jqlite.conf.js b/karma-jqlite.conf.js index 6cb98114..9284f491 100644 --- a/karma-jqlite.conf.js +++ b/karma-jqlite.conf.js @@ -1,14 +1,16 @@ -var angularFiles = require(__dirname + '/angularFiles.js'); +var angularFiles = require('./angularFiles'); +var sharedConfig = require('./karma-shared.conf'); -files = angularFiles.mergeFiles(JASMINE, JASMINE_ADAPTER, 'jstd'); -exclude = ['**/*jasmine*/**', '**/*jstd*/**'].concat(angularFiles.files.jstdExclude); +module.exports = function(config) { +  sharedConfig(config); -autoWatch = true; -logLevel = LOG_INFO; -logColors = true; -browsers = ['Chrome']; +  config.set({ +    files: angularFiles.mergeFiles('jstd'), +    exclude: angularFiles.files.jstdExclude, -junitReporter = { -  outputFile: 'test_out/jqlite.xml', -  suite: 'jqLite' +    junitReporter: { +      outputFile: 'test_out/jqlite.xml', +      suite: 'jqLite' +    } +  });  }; | 
