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-e2e.conf.js     | 33 ++++++++++++++++++---------------
 karma-jqlite.conf.js  | 22 ++++++++++++----------
 karma-jquery.conf.js  | 22 ++++++++++++----------
 karma-modules.conf.js | 21 +++++++++++----------
 karma-shared.conf.js  |  9 +++++++++
 package.json          |  7 ++++++-
 6 files changed, 68 insertions(+), 46 deletions(-)
 create mode 100644 karma-shared.conf.js

diff --git a/karma-e2e.conf.js b/karma-e2e.conf.js
index 07c79c70..78cc1b27 100644
--- a/karma-e2e.conf.js
+++ b/karma-e2e.conf.js
@@ -1,20 +1,23 @@
-var angularFiles = require(__dirname + '/angularFiles.js');
+var sharedConfig = require('./karma-shared.conf');
 
-files = [ANGULAR_SCENARIO, ANGULAR_SCENARIO_ADAPTER, 'build/docs/docs-scenario.js'];
+module.exports = function(config) {
+  sharedConfig(config);
 
-autoWatch = false;
-singleRun = true;
-logLevel = LOG_INFO;
-logColors = true;
-browsers = ['Chrome'];
+  config.set({
+    frameworks: ['ng-scenario'],
+    files: [
+      'build/docs/docs-scenario.js'
+    ],
 
-proxies = {
-  // angular.js, angular-resource.js, etc
-  '/angular': 'http://localhost:8000/build/angular',
-  '/': 'http://localhost:8000/build/docs/'
-};
+    proxies: {
+      // angular.js, angular-resource.js, etc
+      '/angular': 'http://localhost:8000/build/angular',
+      '/': 'http://localhost:8000/build/docs/'
+    },
 
-junitReporter = {
-  outputFile: 'test_out/e2e.xml',
-  suite: 'E2E'
+    junitReporter: {
+      outputFile: 'test_out/e2e.xml',
+      suite: 'E2E'
+    }
+  });
 };
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'
+    }
+  });
 };
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'
+    }
+  });
 };
diff --git a/karma-modules.conf.js b/karma-modules.conf.js
index 9fea7d58..f4c28eb3 100644
--- a/karma-modules.conf.js
+++ b/karma-modules.conf.js
@@ -1,14 +1,15 @@
-var angularFiles = require(__dirname + '/angularFiles.js');
+var angularFiles = require('./angularFiles');
+var sharedConfig = require('./karma-shared.conf');
 
-files = angularFiles.mergeFiles(JASMINE, JASMINE_ADAPTER, 'jstdModules', 'angularSrcModules');
-exclude = ['**/*jasmine*/**', '**/*jstd*/**'];
+module.exports = function(config) {
+  sharedConfig(config);
 
-autoWatch = true;
-logLevel = LOG_INFO;
-logColors = true;
-browsers = ['Chrome'];
+  config.set({
+    files: angularFiles.mergeFiles('jstdModules', 'angularSrcModules'),
 
-junitReporter = {
-  outputFile: 'test_out/modules.xml',
-  suite: 'modules'
+    junitReporter: {
+      outputFile: 'test_out/modules.xml',
+      suite: 'modules'
+    }
+  });
 };
diff --git a/karma-shared.conf.js b/karma-shared.conf.js
new file mode 100644
index 00000000..70be8c97
--- /dev/null
+++ b/karma-shared.conf.js
@@ -0,0 +1,9 @@
+module.exports = function(config) {
+  config.set({
+    frameworks: ['jasmine'],
+    autoWatch: true,
+    logLevel: config.LOG_INFO,
+    logColors: true,
+    browsers: ['Chrome']
+  });
+};
diff --git a/package.json b/package.json
index 4c045d88..4e5b0a4a 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,12 @@
     "q-fs": "0.1.36",
     "qq": "0.3.5",
     "shelljs": "0.1.2",
-    "karma": "0.8.4",
+    "karma": "~0.9.4",
+    "karma-jasmine": "~0.0.1",
+    "karma-chrome-launcher": "~0.0.2",
+    "karma-firefox-launcher": "~0.0.1",
+    "karma-ng-scenario": "~0.0.1",
+    "karma-junit-reporter": "~0.0.1",
     "yaml-js": "0.0.5",
     "showdown": "0.3.1"
   },
-- 
cgit v1.2.3