diff options
| author | Vojta Jina | 2013-06-28 01:47:35 -0700 |
|---|---|---|
| committer | Vojta Jina | 2013-06-28 11:43:38 -0700 |
| commit | 976edc1fc4d4c373bcecddd0389fe94dd528eb4e (patch) | |
| tree | a1f0c9cd725d4cb24902349fccb5a054c81fdd16 /karma-jquery.conf.js | |
| parent | 29f96c852c355d0e283a64111d4923d1bcde8f5f (diff) | |
| download | angular.js-976edc1fc4d4c373bcecddd0389fe94dd528eb4e.tar.bz2 | |
chore: clean up angularFiles.js
Diffstat (limited to 'karma-jquery.conf.js')
| -rw-r--r-- | karma-jquery.conf.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/karma-jquery.conf.js b/karma-jquery.conf.js index 28f2fae2..236824f7 100644 --- a/karma-jquery.conf.js +++ b/karma-jquery.conf.js @@ -5,8 +5,8 @@ module.exports = function(config) { sharedConfig(config); config.set({ - files: angularFiles.mergeFiles('jstdJquery'), - exclude: angularFiles.files.jstdJqueryExclude, + files: angularFiles.mergeFilesFor('karmaJquery'), + exclude: angularFiles.mergeFilesFor('karmaJqueryExclude'), junitReporter: { outputFile: 'test_out/jquery.xml', |