Merge pull request #1823 from angular-fullstack/feat/gen-also-build-test

feat(gen): also build test dir (just like generators dir)

Author: Awk34

Diff for: .gitignore

@@ -1,10 +1,8 @@
 node_modules
 bower_components
-test/temp
+/generators/*
+/test/*
 demo
 .idea
 .DS_Store
-release.txt
-test/fixtures/bower.json
-test/fixtures/package.json
-generators
+release.txt

Diff for: gulpfile.js

@@ -1,29 +1,70 @@
 'use strict';
-var fs = require('fs');
-var path = require('path');
-var Promise = require('bluebird');
-var gulp = require('gulp');
-var babel = require('gulp-babel');
-var del = require('del');
-var runSequence = require('run-sequence');
+const fs = require('fs');
+const path = require('path');
+const exec = require('child_process').exec;
+const _ = require('lodash');
+const Promise = require('bluebird');
+const gulp = require('gulp');
+const gutil = require('gulp-util');
+const babel = require('gulp-babel');
+const gulpMocha = require('gulp-mocha');
+const plumber = require('gulp-plumber');
+const gulpIf = require('gulp-if');
+const del = require('del');
+const lazypipe = require('lazypipe');
+const runSequence = require('run-sequence');
+const merge = require('merge-stream');
+const shell = require('shelljs');
+
+var watching = false;
+
+const mocha = lazypipe()
+    .pipe(gulpMocha, {
+        reporter: 'spec',
+        timeout: 120000,
+        slow: 500,
+        globals: {
+            should: require('should')
+        },
+        require: [
+            './mocha.conf'
+        ]
+    });
+
+const transpile = lazypipe()
+    .pipe(babel);
 
 gulp.task('clean', () => {
     return del(['generators/**/*']);
 });
 
 gulp.task('babel', () => {
-    return gulp.src(['src/**/*.js'])
-        .pipe(babel())
+    let generators = gulp.src(['src/generators/**/*.js'])
+    .pipe(gulpIf(watching, plumber()))
+        .pipe(transpile())
         .pipe(gulp.dest('generators'));
+
+    let test = gulp.src(['src/test/**/*.js'])
+    .pipe(gulpIf(watching, plumber()))
+        .pipe(transpile())
+        .pipe(gulp.dest('test'));
+
+    return merge(generators, test);
 });
 
 gulp.task('watch', () => {
+    watching = true;
     return gulp.watch('src/**/*.js', ['babel']);
 });
 
 gulp.task('copy', () => {
-    return gulp.src(['src/**/*', '!src/**/*.js'])
+    let nonJsGen = gulp.src(['src/generators/**/*', '!src/generators/**/*.js'], {dot: true})
         .pipe(gulp.dest('generators'));
+
+    let nonJsTest = gulp.src(['src/test/**/*', '!src/test/**/*.js'], {dot: true})
+        .pipe(gulp.dest('test'));
+
+    return merge(nonJsGen, nonJsTest);
 });
 
 gulp.task('build', cb => {
@@ -81,3 +122,49 @@ gulp.task('updateFixtures:test', () => {
 gulp.task('updateFixtures:deps', () => {
     return updateFixtures('deps');
 });
+
+function execAsync(cmd, opt) {
+    return new Promise((resolve, reject) => {
+        exec(cmd, opt, (err, stdout, stderr) => {
+            if(err) {
+                console.log(`stderr: ${stderr}`);
+                return reject(err);
+            }
+
+            return resolve(stdout);
+        })
+    });
+}
+
+gulp.task('installFixtures', function() {
+    gutil.log('installing npm & bower dependencies for generated app');
+    let progress = setInterval(() => {
+        process.stdout.write('.');
+    }, 1 * 1000);
+    shell.cd('test/fixtures');
+
+    return Promise.all([
+        execAsync('npm install --quiet', {cwd: '../fixtures'}),
+        execAsync('bower install', {cwd: '../fixtures'})
+    ]).then(() => {
+        process.stdout.write('\n');
+        if(!process.env.SAUCE_USERNAME) {
+            gutil.log('running npm run-script update-webdriver');
+            return execAsync('npm run-script update-webdriver').then(() => {
+                clearInterval(progress);
+                process.stdout.write('\n');
+                shell.cd('../../');
+            });
+        } else {
+            clearInterval(progress);
+            process.stdout.write('\n');
+            shell.cd('../../');
+            return Promise.resolve();
+        }
+    });
+});
+
+gulp.task('test', () => {
+    return gulp.src(['test/pre.test.js', 'test/*.test.js'])
+        .pipe(mocha());
+});

Diff for: mocha.conf.js

@@ -0,0 +1,7 @@
+'use strict';
+
+global.DEBUG = !!process.env.DEBUG;
+
+var fs = require('fs');
+var Promise = require('bluebird');
+Promise.promisifyAll(fs);

Diff for: package.json

@@ -31,7 +31,7 @@
     "url": "git://github.com/angular-fullstack/generator-angular-fullstack.git"
   },
   "scripts": {
-    "test": "gulp build && grunt test",
+    "test": "gulp updateFixtures:test && gulp installFixtures && gulp build && gulp test",
     "prepublish": "gulp build"
   },
   "dependencies": {
@@ -67,14 +67,23 @@
     "grunt-mocha-test": "^0.12.7",
     "grunt-release": "^0.13.0",
     "gulp": "^3.9.1",
+    "gulp-if": "^2.0.0",
+    "gulp-mocha": "^2.2.0",
+    "gulp-plumber": "^1.1.0",
+    "gulp-util": "^3.0.7",
     "jit-grunt": "~0.10.0",
+    "jscs": "^3.0.3",
+    "lazypipe": "^1.0.1",
+    "merge-stream": "^1.0.0",
+    "minimatch": "^3.0.0",
     "mocha": "^2.2.5",
     "q": "^1.0.1",
     "recursive-readdir": "^2.0.0",
     "run-sequence": "^1.1.5",
     "shelljs": "^0.6.0",
+    "should": "^8.3.1",
     "yeoman-assert": "^2.0.0",
-    "yeoman-test": "^1.1.0"
+    "yeoman-test": "^1.3.0"
   },
   "engines": {
     "node": "^5.10.1",

Diff for: src/app/USAGE renamed to src/generators/app/USAGE

@@ -22,7 +22,7 @@ export class Generator extends Base {
     });
 
     this.option('endpointDirectory', {
-      desc: 'Parent directory for enpoints',
+      desc: 'Parent directory for endpoints',
       type: String
     });
   }