Merge branch 'master' of github.com:angular-fullstack/generator-angular-fullstack into canary

Conflicts:
	package.json
	templates/app/server/api/user(auth)/user.model(mongooseModels).js

Author: Awk34

PULL_REQUEST_TEMPLATE.md

@@ -1,2 +1,3 @@
 - [ ] I have read the [Contributing Documents](https://github.com/DaftMonk/generator-angular-fullstack/blob/master/contributing.md)
-- [ ] My commit(s) follow the [AngularJS commit message guidelines](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/)
+- [ ] My commit(s) follow the [AngularJS commit message guidelines](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/)
+- [ ] The generator's tests pass (`generator-angular-fullstack$ npm test`)

package.json

@@ -80,7 +80,7 @@
     "q": "^1.0.1",
     "recursive-readdir": "^2.0.0",
     "run-sequence": "^1.1.5",
-    "shelljs": "^0.6.0",
+    "shelljs": "^0.7.0",
     "should": "^8.3.1",
     "yeoman-assert": "^2.0.0",
     "yeoman-test": "~1.4.0"

templates/app/_package.json

@@ -127,7 +127,7 @@
     "grunt-nodemon": "^0.4.0",
     "grunt-angular-templates": "^1.0.3",
     "grunt-dom-munger": "^3.4.0",
-    "grunt-protractor-runner": "^2.0.0",
+    "grunt-protractor-runner": "^3.1.0",
     "grunt-injector": "^0.6.0",
     "grunt-karma": "~0.12.0",
     "grunt-build-control": "^0.7.0",<% if(filters.sass) { %>
@@ -155,8 +155,8 @@
     "karma-requirejs": "~0.2.2",
     "karma-jade-preprocessor": "0.0.11",
     "karma-phantomjs-launcher": "~1.0.0",<% if (filters.jade) { %>
-    "karma-ng-jade2js-preprocessor": "^0.2.0",<% } else { %>
-    "karma-ng-html2js-preprocessor": "~0.2.0",<% } %>
+    "karma-ng-jade2js-preprocessor": "^0.2.0",<% } %>
+    "karma-ng-html2js-preprocessor": "~0.2.0",
     "karma-spec-reporter": "~0.0.20",
     "sinon-chai": "^2.8.0",
     "mocha": "^2.2.5",<% if (filters.mocha) { %>

templates/app/client/tslint.json(ts)

@@ -21,7 +21,6 @@
     "no-debugger": true,
     "no-duplicate-key": true,
     "no-duplicate-variable": true,
-    "no-empty": true,
     "no-eval": true,
     "no-inferrable-types": true,
     "no-shadowed-variable": true,

templates/app/gulpfile.babel(gulp).js

@@ -227,15 +227,11 @@ gulp.task('inject:js', () => {
         .pipe(gulp.dest(clientPath));
 });<% if(filters.ts) { %>
 
-gulp.task('inject:tsconfig', () => {
-    let src = gulp.src([
-        `${clientPath}/**/!(*.spec|*.mock).ts`,
-        `!${clientPath}/bower_components/**/*`,
-        `${clientPath}/typings/**/*.d.ts`
-    ], {read: false})
+function injectTsConfig(filesGlob, tsconfigPath){
+    let src = gulp.src(filesGlob, {read: false})
         .pipe(plugins.sort());
 
-    return gulp.src('./tsconfig.client.json')
+    return gulp.src(tsconfigPath)
         .pipe(plugins.inject(src, {
             starttag: '"files": [',
             endtag: ']',
@@ -244,6 +240,26 @@ gulp.task('inject:tsconfig', () => {
             }
         }))
         .pipe(gulp.dest('./'));
+}
+
+gulp.task('inject:tsconfig', () => {
+    return injectTsConfig([
+        `${clientPath}/**/!(*.spec|*.mock).ts`,
+       `!${clientPath}/bower_components/**/*`,
+        `${clientPath}/typings/**/*.d.ts`,
+        `!${clientPath}/test_typings/**/*.d.ts`
+    ], 
+    './tsconfig.client.json');
+});
+
+gulp.task('inject:tsconfigTest', () => {
+    return injectTsConfig([
+        `${clientPath}/**/+(*.spec|*.mock).ts`,
+        `!${clientPath}/bower_components/**/*`,
+        `!${clientPath}/typings/**/*.d.ts`,
+        `${clientPath}/test_typings/**/*.d.ts`
+    ], 
+    './tsconfig.client.test.json');
 });<% } %>
 
 gulp.task('inject:css', () => {
@@ -305,12 +321,12 @@ gulp.task('styles', () => {
         .pipe(gulp.dest('.tmp/app'));
 });<% if(filters.ts) { %>
 
-gulp.task('copy:constant', () => {
+gulp.task('copy:constant', ['constant'], () => {
     return gulp.src(`${clientPath}/app/app.constant.js`, { dot: true })
         .pipe(gulp.dest('.tmp/app'));
 })
 
-gulp.task('transpile:client', ['tsd', 'constant', 'copy:constant'], () => {
+gulp.task('transpile:client', ['tsd', 'copy:constant'], () => {
     let tsProject = plugins.typescript.createProject('./tsconfig.client.json');
     return tsProject.src()
         .pipe(plugins.sourcemaps.init())