From 4fbd4bbd8deb92f51d2e79e16774a466e20e0d93 Mon Sep 17 00:00:00 2001
From: Vojta Jina
Date: Fri, 28 Jun 2013 16:30:48 -0700
Subject: chore: update karma to 0.9.4

And also add shared config to make karma configs a bit simpler.---
 karma-jquery.conf.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'karma-jquery.conf.js')

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'
+    }
+  });
 };
-- 
cgit v1.2.3