update config to latest karma specs

karma.conf.js

@@ -1,83 +1,82 @@
 // Testacular configuration
 // Generated on Fri Feb 15 2013 18:38:33 GMT-0500 (EST)
 
+module.exports = function(config) {
 
-// base path, that will be used to resolve files and exclude
+  config.set({
-basePath = '.';
+    // base path, that will be used to resolve files and exclude
+    basePath : '',
+
+    frameworks: ['jasmine'],
+
+    // list of files / patterns to load in the browser
+    files : [
+      'public/javascripts/vendor.js',
+      'public/lib/ace/ace.js',
+      'public/javascripts/app.js',
+
+      'test/app/**/*.coffee'
+    ],
+
+    preprocessors : {
+      '**/*.coffee': 'coffee',
+      '**/javascripts/app.js': 'coverage'
+    },
+
+    // list of files to exclude
+    exclude : [],
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress', 'junit'
+    reporters : ['progress', 'coverage'],
+
+    // web server port
+    port : 9050,
+
+    // cli runner port
+    runnerPort : 9051,
+
+    // enable / disable colors in the output (reporters and logs)
+    colors : true,
+
+    // level of logging
+    // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
+    logLevel : config.LOG_INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch : true,
+
+    // Start these browsers, currently available:
+    // - Chrome
+    // - ChromeCanary
+    // - Firefox
+    // - Opera
+    // - Safari (only Mac)
+    // - PhantomJS
+    // - IE (only Windows)
+    browsers : ['Chrome'],
 
 
-// list of files / patterns to load in the browser
+    // If browser does not capture in given timeout [ms], kill it
-files = [
+    captureTimeout : 5000,
-  JASMINE,
-  JASMINE_ADAPTER,
-
-  'public/javascripts/vendor.js',
-  'public/lib/ace/ace.js',
-  'public/javascripts/app.js',
-
-  'test/app/**/*.coffee'
-];
 
 
-// list of files to exclude
+    // Continuous Integration mode
-exclude = [
+    // if true, it capture browsers, run tests and executing
-  
+    singleRun : false,
-];
 
+    coverageReporter : {
+      type : 'html',
+      dir : 'coverage/'
+    },
 
-// test results reporter to use
+    plugins : [
-// possible values: 'dots', 'progress', 'junit'
+      'karma-jasmine',
-reporters = ['progress', 'coverage'];
+      'karma-chrome-launcher',
-//reporters = ['progress'];
+      'karma-phantomjs-launcher',
+      'karma-coffee-preprocessor',
+      'karma-coverage'
+    ]
+  });
 
-
+};
-// web server port
-port = 9050;
-
-
-// cli runner port
-runnerPort = 9051;
-
-
-// enable / disable colors in the output (reporters and logs)
-colors = true;
-
-
-// level of logging
-// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-logLevel = LOG_INFO;
-
-
-// enable / disable watching file and executing tests whenever any file changes
-autoWatch = true;
-
-
-// Start these browsers, currently available:
-// - Chrome
-// - ChromeCanary
-// - Firefox
-// - Opera
-// - Safari (only Mac)
-// - PhantomJS
-// - IE (only Windows)
-browsers = ['Chrome'];
-
-
-// If browser does not capture in given timeout [ms], kill it
-captureTimeout = 5000;
-
-
-// Continuous Integration mode
-// if true, it capture browsers, run tests and exit
-singleRun = false;
-
-
-preprocessors = {
-  '**/*.coffee': 'coffee',
-  '**/javascripts/app.js': 'coverage'
-};
-
-coverageReporter = {
-  type : 'html',
-  dir : 'coverage/'
-};

package.json

@@ -26,7 +26,7 @@
   ],
   "scripts": {
     "start": "node ./index.js",
-    "test": "brunch test",
+    "test": "./node_modules/.bin/karma start",
     "predeploy": "echo Starting deployment--hold onto your butts.; echo Skipping brunch build --production",
     "postdeploy": "echo Deployed. Unclench."
   },
@@ -72,13 +72,23 @@
     "clean-css-brunch": "> 1.0 < 1.8",
     "auto-reload-brunch": "> 1.0 < 1.8",
     "brunch": "~1.7.4",
-    "karma": "~0.8.0",
     "jasmine-node": "",
     "nodemon": "0.7.5",
     "marked": "0.2.x",
     "telepath-brunch": "https://github.com/nwinter/telepath-brunch/tarball/master",
     "bower": "~1.2.8",
-    "bless-brunch": "~1.6.1"
+    "bless-brunch": "~1.6.1",
+    "karma-script-launcher": "~0.1.0",
+    "karma-chrome-launcher": "~0.1.2",
+    "karma-firefox-launcher": "~0.1.3",
+    "karma-html2js-preprocessor": "~0.1.0",
+    "karma-coffee-preprocessor": "~0.1.2",
+    "karma-jasmine": "~0.1.5",
+    "requirejs": "~2.1.10",
+    "karma-requirejs": "~0.2.1",
+    "karma-phantomjs-launcher": "~0.1.1",
+    "karma": "~0.10.9",
+    "karma-coverage": "~0.1.4"
   },
   "license": "Copyright © 2014 CodeCombat",
   "private": true,