Merge branch 'master' of github.com:angular-ui/ui-router

Author: ksperling

Gruntfile.js

@@ -58,7 +58,7 @@ module.exports = function (grunt) {
     },
     watch: {
       files: ['src/*.js', 'test/**/*.js'],
-      tasks: ['build','karma:debug']
+      tasks: ['build','karma:debug:run']
     },
     connect: {
       server: {}
@@ -74,16 +74,16 @@ module.exports = function (grunt) {
 		debug: {
 			configFile: 'test/test-config.js',
 			runnerPort: 9999,
-			singleRun: true,
-			browsers: ['PhantomJS']
+			background: true,
+			browsers: ['Chrome']
 		}
 	}
   });
 
   grunt.registerTask('default', ['build', 'jshint', 'karma:unit']);
   grunt.registerTask('build', 'Perform a normal build', ['concat', 'uglify']);
   grunt.registerTask('dist', 'Perform a clean build and generate documentation', ['clean', 'build', 'jsdoc']);
-  grunt.registerTask('dev', 'Run dev server and watch for changes', ['build', 'connect', 'watch']);
+  grunt.registerTask('dev', 'Run dev server and watch for changes', ['build', 'connect', 'karma:debug', 'watch']);
 
   // grunt.registerTask('test-server', 'Start testacular server', function () {
     // //Mark the task as async but never call done, so the server stays up

README.md

@@ -24,3 +24,19 @@ To evolve the concept of an Angular "Route" into a more general concept of a "St
 * [Generated Docs](http://angular-ui.github.com/ui-router/build/doc/)
 * Latest build: [angular-ui-states.min.js](http://angular-ui.github.com/ui-router/build/angular-ui-states.min.js)
   (uncompressed [angular-ui-states.js](http://angular-ui.github.com/ui-router/build/angular-ui-states.js))
+
+# Developing
+
+Dependencies for building the solution and running tests:
+
+* [karma](http://karma-runner.github.com/) - run: `$ npm install -g karma`
+* [grunt-cli](https://github.com/gruntjs/grunt-cli) - run: `$ npm install -g grunt-cli`
+* Then install development dependencies with: `$ npm install`
+
+There is a number of targets in the gruntfile that is used to building the solution, documents etc.
+
+* `grunt`: Perform a normal build, runs jshint and karma tests
+* `grunt build`: Perform a normal build
+* `grunt dist`: Perform a clean build and generate documentation
+* `grunt dev`: Run dev server and watch for changes, builds and runs karma tests on changes.
+

package.json

@@ -36,7 +36,7 @@
     "grunt-contrib-watch": "~0.3.1",
     "grunt-contrib-connect": "~0.2.0",
     "grunt-contrib-clean": "~0.4.0",
-    "grunt-karma": "~0.3.0",
+    "grunt-karma": "~0.4.3",
     "underscore": "~1.4.4"
   }
 }