Merge pull request #110 from eleven-labs/improve-test

Improved test on the generated files

Author: Mehdy Dara

.coveralls.yml

@@ -0,0 +1 @@
+repo_token: 80AGmTLC53q6aLmiJaUX4Sa3vkl8jVUbg

.gitignore

@@ -1,4 +1,5 @@
 node_modules/
-temp/
+tempGulpAngular/
+coverage/
 .DS_Store
 npm-debug.log

.travis.yml

@@ -1,7 +1,13 @@
 language: node_js
+
 node_js:
   - '0.10'
+
 before_install:
   - npm install -g npm@latest
   - npm install -g bower
   - npm install -g gulp
+  - npm install -g istanbul
+
+after_script:
+  - npm run coveralls

README.md

@@ -60,6 +60,38 @@ yo gulp-angular [app-name]
 
 [Best Practice Recommendations for Angular App Structure](https://docs.google.com/document/d/1XXMvReO8-Awi1EZXAXS4PzDzdNvV6pGcuaF4Q9821Es/pub)
 
+The root directory generated for a app with name `gulpAngular` :
+<pre>
+├──  src/
+│   ├──  app/
+│   │   ├──  main/
+│   │   │   ├──  main.controller.js
+│   │   │   └──  main.html
+│   │   └──  index.js
+│   │   └──  index.(css|less|scss)
+│   │   └──  vendor.(css|less|scss)
+│   ├──  assets/
+│   │   └──  images/
+│   ├──  components/
+│   │   └──  navbar/
+│   │   │   ├──  navbar.controller.js
+│   │   │   └──  navbar.html
+│   ├──  404.html
+│   ├──  favico.ico
+│   └──  index.html
+├──  gulp/
+├──  test/
+├──  bower_components/
+├──  nodes_modules/
+├──  .bowerrc
+├──  .editorconfig
+├──  .gitignore
+├──  .jshintrc
+├──  bower.json
+├──  gulpfile.js
+├──  package.json
+</pre>
+
 ## Features included in the gulpfile
 * *useref* : allow configuration of your files in comments of your HTML file
 * *ngAnnotate* : convert simple injection to complete syntax to be minification proof

app/files.json

@@ -10,6 +10,7 @@
     "test/e2e"
   ],
   "copies": [
+    "gulpfile.js",
     "gulp/e2e-tests.js",
     "gulp/server.js",
     "gulp/proxy.js",
@@ -24,7 +25,6 @@
   "templates": [
     "package.json",
     "bower.json",
-    "gulpfile.js",
     "gulp/build.js",
     "gulp/watch.js",
     "gulp/wiredep.js",

app/index.js

@@ -8,20 +8,24 @@ var chalk = require('chalk');
 var prompts = require('./prompts.json');
 
 var GulpAngularGenerator = yeoman.generators.Base.extend({
-  /* Initialization, evaluate appname */
-  init: function () {
-    this.pkg = require('../package.json');
 
-    this.argument('appname', { type: String, required: false });
+  init: function () {
+    // Define the appname
+    this.argument('appname', {
+      type: String,
+      required: false
+    });
     this.appname = this.appname || path.basename(process.cwd());
     this.appname = this._.camelize(this._.slugify(this._.humanize(this.appname)));
   },
 
   info: function () {
-    this.log(yosay(
-      chalk.red('Welcome!') + '\n' +
-      chalk.yellow('You\'re using the fantastic generator for scaffolding an application with Angular and Gulp!')
-    ));
+    if (!this.options['skip-welcome-message']) {
+      this.log(yosay(
+        chalk.red('Welcome!') + '\n' +
+        chalk.yellow('You\'re using the fantastic generator for scaffolding an application with Angular and Gulp!')
+      ));
+    }
   },
 
   checkYoRc: function() {
@@ -78,7 +82,8 @@ var GulpAngularGenerator = yeoman.generators.Base.extend({
   /* Install dependencies */
   install: function () {
     this.installDependencies({
-      skipInstall: this.options['skip-install']
+      skipInstall: this.options['skip-install'],
+      skipMessage: this.options['skip-message']
     });
   }
 });

app/src/compile.js

@@ -16,8 +16,7 @@ module.exports = function () {
     return module.module;
   });
 
-  if(this.props.ui.key === 'bootstrap' &&
-      this.props.cssPreprocessor.extension !== 'scss') {
+  if(this.props.ui.key === 'bootstrap' && this.props.cssPreprocessor.extension !== 'scss') {
     this.props.ui.name = 'bootstrap';
   }
 

app/templates/_gulpfile.js renamed to app/templates/gulpfile.js

@@ -16,12 +16,13 @@
   "repository": "Swiip/generator-gulp-angular",
   "scripts": {
     "pretest": "cd test/deps && npm install && bower install",
-    "test": "mocha -g protractor -i"
+    "test": "mocha -g protractor -i",
+    "coveralls": "istanbul cover ./node_modules/mocha/bin/_mocha -- -g protractor -i && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
+    "cover": "istanbul cover ./node_modules/mocha/bin/_mocha -- ./test/*.js"
   },
   "dependencies": {
     "async": "~0.8.0",
     "chalk": "~0.4.0",
-    "lodash": "~2.4.1",
     "q": "~1.0.1",
     "yeoman-generator": "~0.17.0",
     "yosay": "^0.3.0"
@@ -31,9 +32,15 @@
     "chai": "~1.9.1",
     "chai-as-promised": "~4.1.1",
     "colors": "~0.6.2",
+    "coveralls": "~2.11.0",
+    "cross-spawn": "~0.2.3",
+    "fixture-stdout": "^0.2.1",
     "gulp-less": "^1.3.3",
     "gulp-sass": "^0.7.3",
-    "mocha": "~1.21.0"
+    "istanbul": "~0.3.0",
+    "lodash": "~2.4.1",
+    "mocha": "~1.21.0",
+    "mocha-lcov-reporter": "0.0.1"
   },
   "peerDependencies": {
     "yo": ">=1.0.0"

package.json

@@ -33,7 +33,8 @@
     "require-dir": "^0.1.0",
     "browser-sync": "^1.3.6",
     "http-proxy": "^1.3.0",
-    "protractor": "^1.1.1",
+    "chalk": "^0.4.0",
+    "protractor": "^1.4.0",
     "uglify-save-license": "^0.4.1",
 
     "gulp-less": "^1.3.3",