Merge branch 'failing-build-625'

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
 node_js:
   - '0.10'
-  - '0.8'
 before_install:
   - currentfolder=${PWD##*/}
   - if [ "$currentfolder" != 'generator-angular' ]; then cd .. && eval "mv $currentfolder generator-angular" && cd generator-angular; fi

package.json

@@ -8,30 +8,26 @@
     "framework",
     "component",
     "front-end",
-    "app"
+    "app",
+    "angular"
   ],
-  "homepage": "https://github.com/yeoman/generator-angular",
-  "bugs": "https://github.com/yeoman/generator-angular/issues",
   "author": "Chrome Developer Relations",
   "main": "app/index.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/yeoman/generator-angular.git"
-  },
+  "repository": "yeoman/generator-angular",
   "scripts": {
     "test": "mocha"
   },
   "dependencies": {
-    "yeoman-generator": "~0.13.0",
-    "chalk": "~0.3.0",
+    "yeoman-generator": "~0.16.0",
+    "chalk": "~0.4.0",
     "wiredep": "~0.4.2"
   },
   "peerDependencies": {
-    "generator-karma": "~0.6.0",
+    "generator-karma": ">=0.6.0",
     "yo": ">=1.0.0"
   },
   "devDependencies": {
-    "mocha": "~1.14.0",
+    "mocha": "*",
     "grunt": "~0.4.1",
     "grunt-contrib-jshint": "~0.7.2",
     "grunt-conventional-changelog": "~1.0.0",
@@ -42,7 +38,7 @@
     "grunt-release": "~0.6.0"
   },
   "engines": {
-    "node": ">=0.8.0",
+    "node": ">=0.10.0",
     "npm": ">=1.2.10"
   },
   "licenses": [

templates/coffeescript-min/decorator.coffee

@@ -1,6 +1,6 @@
 'use strict'
 
-angular.module("<%= scriptAppName").config ["$provide", ($provide) ->
+angular.module("<%= scriptAppName %>").config ["$provide", ($provide) ->
   $provide.decorator "<%= cameledName %>", ($delegate) ->
     # decorate the $delegate
     $delegate

templates/coffeescript/decorator.coffee

@@ -1,6 +1,6 @@
 'use strict'
 
-angular.module("<%= scriptAppName").config ($provide) ->
+angular.module("<%= scriptAppName %>").config ($provide) ->
   $provide.decorator "<%= cameledName %>", ($delegate) ->
     # decorate the $delegate
     $delegate

templates/common/Gruntfile.js

@@ -450,9 +450,9 @@ module.exports = function (grunt) {
     ]);
   });
 
-  grunt.registerTask('server', function () {
+  grunt.registerTask('server', function (target) {
     grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.');
-    grunt.task.run(['serve']);
+    grunt.task.run(['serve:' + target]);
   });
 
   grunt.registerTask('test', [

templates/common/_package.json

@@ -31,6 +31,6 @@
     "grunt-typescript": "~0.2.7"
   },
   "engines": {
-    "node": ">=0.8.0"
+    "node": ">=0.10.0"
   }
 }

test/test-file-creation.js

@@ -240,9 +240,9 @@ describe('Angular generator', function () {
       });
       angular.run([], function (){
         angularView.run([], function () {
-          helpers.assertFiles([
+          helpers.assertFile(
             ['app/views/foo.html']
-          ]);
+          );
           done();
         });
       });
@@ -261,9 +261,9 @@ describe('Angular generator', function () {
       });
       angular.run([], function (){
         angularView.run([], function () {
-          helpers.assertFiles([
+          helpers.assertFile(
             ['app/views/foo/bar.html']
-          ]);
+          );
           done();
         });
       });