Fix bower config, some grunt/jsdoc etc tweaks

Author: ksperling

Gruntfile.js

@@ -31,6 +31,7 @@ module.exports = function (grunt) {
       build: {
         src: [
           'src/common.js',
+          'src/resolve.js',
           'src/templateFactory.js',
           'src/urlMatcherFactory.js',
           'src/urlRouter.js',
@@ -65,24 +66,21 @@ module.exports = function (grunt) {
     },
     watch: {
       files: ['src/*.js', 'test/**/*.js'],
-      tasks: ['build', 'karma:debug:run']
+      tasks: ['build', 'karma:background:run']
     },
     connect: {
       server: {}
     },
   karma: {
+    options: {
+      configFile: 'config/karma.js'
+    },
     unit: {
-      configFile: 'test/test-config.js',
-      runnerPort: 9999,
-      singleRun: true,
-      browsers: ['PhantomJS']
+      singleRun: true
     },
-    
-    debug: {
-      configFile: 'test/test-config.js',
-      runnerPort: 9999,
+    background: {
       background: true,
-      browsers: ['Chrome']
+      browsers: [ grunt.option('browser') || 'PhantomJS' ]
     }
   }
   });
@@ -91,11 +89,11 @@ module.exports = function (grunt) {
   grunt.registerTask('build', 'Perform a normal build', ['concat', 'uglify']);
   grunt.registerTask('dist', 'Perform a clean build and generate documentation', ['clean', 'build', 'jsdoc']);
   grunt.registerTask('release', 'Tag and perform a release', ['prepare-release', 'dist', 'perform-release']);
-  grunt.registerTask('dev', 'Run dev server and watch for changes', ['build', 'connect', 'karma:debug', 'watch']);
+  grunt.registerTask('dev', 'Run dev server and watch for changes', ['build', 'connect', 'karma:background', 'watch']);
 
   grunt.registerTask('jsdoc', 'Generate documentation', function () {
     promising(this,
-      system('node_modules/jsdoc/jsdoc -c jsdoc-conf.json -d \'' + grunt.config('builddir') + '\'/doc src')
+      system('node_modules/jsdoc/jsdoc -c config/jsdoc.js -d \'' + grunt.config('builddir') + '\'/doc src')
     );
   });
 

bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "ui-router",
+  "name": "angular-ui-router",
   "version": "0.0.2",
   "main": "./release/angular-ui-router.min.js",
   "dependencies": {

jsdoc-conf.json renamed to config/jsdoc.js

@@ -12,6 +12,7 @@ files = [
   'test/testUtils.js',
 
   'src/common.js',
+  'src/resolve.js',
   'src/templateFactory.js',
   'src/urlMatcherFactory.js',
   'src/urlRouter.js',
@@ -37,9 +38,6 @@ reporter = 'dots';
 // web server port
 port = 8080;
 
-// cli runner port
-runnerPort = 9100;
-
 // enable / disable colors in the output (reporters and logs)
 colors = true;
 
@@ -60,4 +58,5 @@ autoWatchInterval = 0;
 // - Opera
 // - Safari
 // - PhantomJS
-browsers = [];
+browsers = [ 'PhantomJS' ];
+

test/test-config.js renamed to config/karma.js

@@ -36,7 +36,7 @@
     "grunt-contrib-connect": "~0.2.0",
     "grunt-contrib-clean": "~0.4.0",
     "grunt-karma": "~0.4.3",
-    "jsdoc": "git://github.com/jsdoc3/jsdoc.git#v3.1.0",
+    "jsdoc": "git://github.com/jsdoc3/jsdoc.git#v3.1.1",
     "shelljs": "~0.1.4",
     "faithful-exec": "~0.1.0"
   }

package.json

@@ -43,7 +43,6 @@ describe('$route', function() {
       $rootScope.$digest();
       $httpBackend.flush();
       expect(log).toEqual('before();after();');
-      debugger;
       expect($route.current.params).toEqual({book:'Moby', chapter:'Intro', p:'123'});
 
       log = '';