Merge pull request #27 from adambullmer/update-app

Bumped angular-bro app version
adambullmer · Apr 3, 2017 · ba5eaa6 · ba5eaa6
2 parents 8130964 + fce4230
commit ba5eaa6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -58,12 +58,6 @@ module.exports = generators.Base.extend({
                 this.destinationPath('Gruntfile.js')
             );
 
-            this.fs.copyTpl(
-                this.templatePath('index.html'),
-                this.destinationPath('index.html'),
-                this
-            );
-
             this.fs.copy(
                 this.templatePath('karma.conf.js'),
                 this.destinationPath('karma.conf.js')
@@ -83,6 +77,12 @@ module.exports = generators.Base.extend({
                 this
             );
 
+            this.fs.copyTpl(
+                this.templatePath('app/index.html'),
+                this.destinationPath('app/index.html'),
+                this
+            );
+
             this.fs.copyTpl(
                 this.templatePath('app/router.js'),
                 this.destinationPath('app/router.js'),

diff --git a/generators/app/templates/index.html → generators/app/templates/app/index.html b/generators/app/templates/index.html → generators/app/templates/app/index.html
diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json
@@ -10,7 +10,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "angular-bro-app": "0.10.0",
+    "angular-bro-app": "0.10.1",
     "broccoli": "0.16.9",
     "grunt": "^1.0.1",
     "grunt-broccoli": "^0.4.1",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-angular-bro",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Angular app scaffolding and build chain",
   "main": "generators/app/index.js",
   "files": [

diff --git a/test/app.js b/test/app.js
@@ -12,16 +12,15 @@ describe('generator-angular-bro:app', function () {
 
     it('creates files', function () {
         assert.file([
-            '.jscsrc',
-            '.jshintrc',
+            '.eslintrc',
             'bower.json',
             'Brocfile.js',
             'circle.yml',
             'Gruntfile.js',
-            'index.html',
             'karma.conf.js',
             'package.json',
             'app/app.js',
+            'app/index.html',
             'app/router.js',
             'app/test-app.js',
             'assets/.gitkeep',
@@ -52,8 +51,8 @@ describe('generator-angular-bro:app', function () {
             assert.fileContent('bower.json', /\n  "name": "test-app",\n/);
         });
 
-        it('index.html', function () {
-            assert.fileContent('index.html', /\n        <title>Test App<\/title>\n/);
+        it('app/index.html', function () {
+            assert.fileContent('app/index.html', /\n        <title>Test App<\/title>\n/);
         });
 
         it('package.json', function () {