Refactor karma configs and use grunt-karma

Author: vojtajina

Gruntfile.js

@@ -1,4 +1,3 @@
-var util = require('./test/lib/karma-util.js');
 module.exports = function(grunt) {
 
   grunt.loadNpmTasks('grunt-shell');
@@ -7,6 +6,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-karma');
 
   grunt.initConfig({
     shell: {
@@ -17,26 +17,44 @@ module.exports = function(grunt) {
         command: 'cp -R components/components-font-awesome/font app/font'
       }
     },
+
     connect: {
+      options: {
+        port: 8000,
+        base: './app'
+      },
       server: {
         options: {
-          port: 8000,
-          hostname: '0.0.0.0',
-          base: './app',
           keepalive: true
         }
-      }
-    },
-    test: {
-      unit: './test/karma-unit.conf.js',
-      midway: './test/karma-midway.conf.js',
-      e2e: './test/karma-e2e.conf.js'
+      },
+      testserver: {}
     },
-    autotest: {
-      unit: './test/karma-unit.conf.js',
-      midway: './test/karma-midway.conf.js',
-      e2e: './test/karma-e2e.conf.js'
+
+    karma: {
+      unit: {
+        configFile: './test/karma-unit.conf.js',
+        autoWatch: false,
+        singleRun: true
+      },
+      unit_auto: {
+        configFile: './test/karma-unit.conf.js'
+      },
+      midway: {
+        configFile: './test/karma-midway.conf.js',
+        autoWatch: false,
+        singleRun: true
+      },
+      midway_auto: {
+        configFile: './test/karma-midway.conf.js'
+      },
+      e2e: {
+        configFile: './test/karma-e2e.conf.js',
+        autoWatch: false,
+        singleRun: true
+      }
     },
+
     watch: {
       scripts: {
       files: ['app/scripts/**/*.js','app/styles/**/*.css'],
@@ -46,6 +64,7 @@ module.exports = function(grunt) {
         },
       },
     },
+
     concat: {
       styles: {
         dest: './app/assets/app.css',
@@ -54,7 +73,7 @@ module.exports = function(grunt) {
           'components/components-font-awesome/css/font-awesome.css',
           'components/bootstrap.css/css/bootstrap.css',
           'app/styles/app.css'
-        ] 
+        ]
       },
       scripts: {
         options: {
@@ -76,13 +95,8 @@ module.exports = function(grunt) {
     }
   });
 
-  grunt.registerMultiTask('test', 'Run and watch the unit tests with Karma', function() {
-    util.startKarma.call(util, this.data, true, this.async());
-  });
-
-  grunt.registerMultiTask('autotest', 'Run and watch the unit tests with Karma', function(){
-    util.startKarma.call(util, this.data, false, this.async());
-  });
+  grunt.registerTask('test:e2e', ['connect:testserver', 'karma:e2e']);
+  grunt.registerTask('test', ['karma:unit', 'karma:midway', 'test:e2e']);
 
   //installation-related
   grunt.registerTask('install', ['shell:install','shell:font_awesome_fonts']);

package.json

@@ -15,8 +15,9 @@
     "grunt-contrib-watch": "~0.4.4",
     "grunt-shell": "~0.2.2",
     "grunt-contrib-copy": "~0.4.1",
+    "grunt-karma": "git://github.com/karma-runner/grunt-karma.git#karma-v0.10",
     "bower": "~0.9.2",
-    "karma": "0.9.3",
+    "karma": "~0.9.5",
     "karma-mocha": "latest",
     "karma-chrome-launcher": "latest",
     "karma-safari-launcher": "latest",

test/karma-e2e.conf.js

@@ -1,18 +1,14 @@
-module.exports = function(karma) {
-  shared = require(__dirname + "/karma-shared.conf.js").shared;
-  karma.configure({
-    urlRoot: '/_karma_/',
-    plugins: shared.plugins,
+var shared = require('./karma-shared.conf');
+
+module.exports = function(config) {
+  shared(config);
+
+  config.set({
     frameworks: ['ng-scenario'],
-    basePath: shared.basePath,
-    browsers: shared.browsers,
-    autoWatch: shared.autoWatch,
-    reporters: shared.reporters,
-    singleRun: shared.singleRun,
-    colors: shared.colors,
-    proxies: shared.proxies,
-    files: [
-      './test/e2e/**/*.js'
-    ]
+    files: ['test/e2e/**/*.js'],
+    urlRoot: '/_karma_/',
+    proxies: {
+      '/': 'http://localhost:8000/'
+    }
   });
 };

test/karma-midway.conf.js

@@ -1,12 +1,13 @@
-module.exports = function(karma) {
-  config = require(__dirname + "/karma-shared.conf.js").shared;
-  config.files = config.files.concat([
+var shared = require('./karma-shared.conf');
+
+module.exports = function(config) {
+  shared(config);
+
+  config.files = shared.files.concat([
     //extra testing code
     'components/ngMidwayTester/Source/ngMidwayTester.js',
 
     //test files
-    './test/midway/**/*.js'
+    'test/midway/**/*.js'
   ]);
-  config.logLevel = karma.LOG_ERROR;
-  karma.configure(config);
 };

test/karma-shared.conf.js

@@ -1,27 +1,19 @@
-var shared = {};
-shared.plugins = [
-  'karma-mocha',
-  'karma-ng-scenario',
-  'karma-chrome-launcher',
-  'karma-firefox-launcher',
-  'karma-safari-launcher',
-  'karma-ng-scenario'
-];
-
-shared.frameworks = ['mocha'];
-shared.basePath  = '../';
-shared.singleRun = false
-shared.autoWatch = true
-shared.colors    = true
+var shared = function(config) {
+  config.set({
+    basePath: '../',
+    frameworks: ['mocha'],
+    reporters: ['progress'],
+    browsers: ['Chrome'],
+    autoWatch: true,
 
-shared.reporters = ['progress'];
-shared.browsers = ['Chrome'];
-shared.proxies = {
-  '/': 'http://localhost:8000/'
+    // these are default values anyway
+    singleRun: false,
+    colors: true,
+  });
 };
 
 shared.files = [
-  './test/mocha.conf.js',
+  'test/mocha.conf.js',
 
   //3rd Party Code
   'components/angularjs/index.js',
@@ -37,9 +29,9 @@ shared.files = [
   'app/scripts/app.js',
 
   //Test-Specific Code
-  './node_modules/chai/chai.js',
-  './test/lib/chai-should.js',
-  './test/lib/chai-expect.js'
+  'node_modules/chai/chai.js',
+  'test/lib/chai-should.js',
+  'test/lib/chai-expect.js'
 ];
 
-exports.shared = shared;
+module.exports = shared;

test/karma-unit.conf.js

@@ -1,11 +1,13 @@
-module.exports = function(karma) {
-  config = require(__dirname + "/karma-shared.conf.js").shared;
-  config.files = config.files.concat([
+var shared = require('./karma-shared.conf');
+
+module.exports = function(config) {
+  shared(config);
+
+  config.files = shared.files.concat([
     //extra testing code
     'components/angular-mocks/index.js',
 
     //test files
     './test/unit/**/*.js'
   ]);
-  karma.configure(config);
 };