From b6f7566bf7057107101e87f34e4660e8b3d50850 Mon Sep 17 00:00:00 2001
From: Cameron Dawson <cdawson@mozilla.com>
Date: Thu, 29 Aug 2013 10:49:02 -0700
Subject: [PATCH] karma now running.  tests not using mock $httpBackend yet

---
 tests/ui/config/karma-e2e.conf.js | 46 ++++++++++++++++++-----------
 tests/ui/config/karma.conf.js     | 48 ++++++++++++++++---------------
 2 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/tests/ui/config/karma-e2e.conf.js b/tests/ui/config/karma-e2e.conf.js
index 51f51d2ee..6fd352461 100755
--- a/tests/ui/config/karma-e2e.conf.js
+++ b/tests/ui/config/karma-e2e.conf.js
@@ -1,22 +1,36 @@
-basePath = '../';
+module.exports = function (config) {
+    config.set({
+        frameworks: ['requirejs'],
 
-files = [
-  ANGULAR_SCENARIO,
-  ANGULAR_SCENARIO_ADAPTER,
-  'test/e2e/**/*.js'
-];
+        basePath: '../',
 
-autoWatch = false;
+        files: [
+            'app/vendor/angular/angular.js',
+            'app/vendor/angular/angular-*.js',
+            'app/vendor/*.js',
+            'app/js/**/*.js',
+            'app/js/controllers/**/*.js',
+            'test/vendor/angular/angular-mocks.js',
+            'test/vendor/jquery-2.0.3.js',
+            'test/vendor/jasmine-jquery.js',
+            'test/e2e/**/*.js',
 
-browsers = ['Chrome'];
+            // fixtures
+            {pattern: 'app/resources/*.json', watched: true, served: true, included: false}
+        ],
 
-singleRun = true;
+        autoWatch: false,
+        singleRun: true,
 
-proxies = {
-  '/': 'http://localhost:8000/'
-};
-
-junitReporter = {
-  outputFile: 'test_out/e2e.xml',
-  suite: 'e2e'
+        browsers: ['Firefox'],
+
+        proxies: {
+          '/': 'http://localhost:8000/'
+        },
+
+        junitReporter: {
+          outputFile: 'test_out/e2e.xml',
+          suite: 'e2e'
+        }
+    });
 };
diff --git a/tests/ui/config/karma.conf.js b/tests/ui/config/karma.conf.js
index b6b928327..3ec12d2b4 100755
--- a/tests/ui/config/karma.conf.js
+++ b/tests/ui/config/karma.conf.js
@@ -1,30 +1,32 @@
-frameworks = ['jasmine'];
+module.exports = function (config) {
+    config.set({
+        frameworks: ['jasmine'],
 
-basePath = '../';
+        basePath: '../',
 
-files = [
-  JASMINE,
-  JASMINE_ADAPTER,
-  'app/vendor/angular/angular.js',
-  'app/vendor/angular/angular-*.js',
-  'app/vendor/*.js',
-  'app/js/**/*.js',
-  'app/js/controllers/**/*.js',
-  'test/vendor/angular/angular-mocks.js',
-  'test/vendor/jquery-2.0.3.js',
-  'test/vendor/jasmine-jquery.js',
-  'test/unit/**/*.js',
+        files: [
+          'app/vendor/angular/angular.js',
+          'app/vendor/angular/angular-*.js',
+          'app/vendor/*.js',
+          'app/js/**/*.js',
+          'app/js/controllers/**/*.js',
+          'test/vendor/angular/angular-mocks.js',
+          'test/vendor/jquery-2.0.3.js',
+          'test/vendor/jasmine-jquery.js',
+          'test/unit/**/*.js',
 
-  // fixtures
-  {pattern: 'app/resources/*.json', watched: true, served: true, included: false}
-];
+          // fixtures
+          {pattern: 'app/resources/*.json', watched: true, served: true, included: false}
+        ],
 
-autoWatch = false;
-singleRun = true;
+        autoWatch: false,
+        singleRun: true,
 
-browsers = ['Firefox'];
+        browsers: ['Firefox'],
 
-junitReporter = {
-  outputFile: 'test_out/unit.xml',
-  suite: 'unit'
+        junitReporter: {
+          outputFile: 'test_out/unit.xml',
+          suite: 'unit'
+        }
+    });
 };