aboutsummaryrefslogtreecommitdiffstats
path: root/karma-jquery.conf.js
diff options
context:
space:
mode:
authorVojta Jina2013-06-28 16:30:48 -0700
committerVojta Jina2013-06-28 16:30:48 -0700
commit4fbd4bbd8deb92f51d2e79e16774a466e20e0d93 (patch)
tree25f37c045159dc4e7d928016282540c6caf61b8c /karma-jquery.conf.js
parent2fae296cbcd1eedac226f7bcda146426b8239322 (diff)
downloadangular.js-4fbd4bbd8deb92f51d2e79e16774a466e20e0d93.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-jquery.conf.js')
-rw-r--r--karma-jquery.conf.js22
1 files changed, 12 insertions, 10 deletions
diff --git a/karma-jquery.conf.js b/karma-jquery.conf.js
index 7b527a15..28f2fae2 100644
--- a/karma-jquery.conf.js
+++ b/karma-jquery.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, 'jstdJquery');
-exclude = ['**/*jasmine*/**', '**/*jstd*/**'].concat(angularFiles.files.jstdJqueryExclude);
+module.exports = function(config) {
+ sharedConfig(config);
-autoWatch = true;
-logLevel = LOG_INFO;
-logColors = true;
-browsers = ['Chrome'];
+ config.set({
+ files: angularFiles.mergeFiles('jstdJquery'),
+ exclude: angularFiles.files.jstdJqueryExclude,
-junitReporter = {
- outputFile: 'test_out/jquery.xml',
- suite: 'jQuery'
+ junitReporter: {
+ outputFile: 'test_out/jquery.xml',
+ suite: 'jQuery'
+ }
+ });
};