From bc07064328afd37a132e2a010b4089912726fb9f Mon Sep 17 00:00:00 2001
From: Mario Zupan <mzupanmz@gmail.com>
Date: Sat, 6 Dec 2014 17:55:11 +0100
Subject: [PATCH] change test execution to grunt

---
 Gruntfile.js | 9 ++++++++-
 README.md    | 3 +--
 package.json | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 855728c..ff7381c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -3,6 +3,11 @@ module.exports = function(grunt) {
     // Project configuration.
     grunt.initConfig({
         pkg : grunt.file.readJSON('package.json'),
+        karma: {
+            unit: {
+                configFile: 'karma.conf.js'
+            }
+        },
         uglify : {
             options : {
                 banner : '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n'
@@ -61,7 +66,9 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-jshint');
 
     grunt.loadNpmTasks('grunt-requirejs');
+    grunt.loadNpmTasks('grunt-karma');
     // Default task(s).
     grunt.registerTask('default', ['jshint', 'requirejs', 'uglify']);
+    grunt.registerTask('test', ['karma']);
 
-}; 
\ No newline at end of file
+}; 
diff --git a/README.md b/README.md
index 10ea6ed..f95bfbe 100644
--- a/README.md
+++ b/README.md
@@ -135,8 +135,7 @@ Unit Tests can be run with [Karma][karmaUrl] and written using [Mocha][mochaUrl]
 
 ```console
 > npm install
-> npm install -g karma-cli
-> npm test
+> grunt test
 ```
 
 
diff --git a/package.json b/package.json
index 56a8f88..bf685dc 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-nodeunit": "~0.4.1",
     "grunt-contrib-uglify": "~0.5.0",
+    "grunt-karma": "^0.9.0",
     "grunt-requirejs": "^0.4.2",
     "karma": "latest",
     "karma-chai": "latest",