1 files changed, 28 insertions, 19 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index c09bdde..e2febff 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -27,25 +27,33 @@ module.exports = function (grunt) {
         },
         watch: {
             options: {
-                livereload: true
+                spawn: false,
+                dateFormat: function(time){}
             },
-            files: [
-                'Gruntfile.js',
-                'injector.js',
-                'injector-tests.js'
-            ],
-            tasks: ['default', 'karma:unit:run']
+            test: {
+                files: [
+                    "injector.js",
+                    "injector-tests.js"
+                ],
+                tasks: ['test']
+            }
         },
-        karma: {
-            options: {
-                configFile: "karma.conf.js"
-            },
-            unit: {
-                background: true
-            },
-            once: {
-                singleRun: true,
-                reporters: ['dots']
+        mochaTest: {
+            test: {
+                options: {
+                    clearRequireCache: true,
+                    reporter: 'min',
+                    require: [
+                        function(){
+                            Injector = require('./injector');
+                            expect = require('chai').expect;
+                        }
+                    ]
+                },
+                src: [
+                    "injector.js",
+                    "injector-tests.js"
+                ]
             }
         }
     });
@@ -53,9 +61,10 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-karma');
+    grunt.loadNpmTasks('grunt-mocha-test');
 
     grunt.registerTask('default', ['jshint', 'uglify']);
-    grunt.registerTask('live', ['default', 'karma:unit:start', 'karma:unit:run', 'watch']);
+    grunt.registerTask('test', ['jshint', 'mochaTest']);
+    grunt.registerTask('live', ['test', 'watch:test']);
 
 };