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

Author: Awk34

Diff for: app/generator.js

@@ -63,6 +63,13 @@ export default class Generator extends Base {
 
             if (this.skipConfig) {
               this.filters = existingFilters;
+
+              this.scriptExt = this.filters.ts ? 'ts' : 'js';
+              this.templateExt = this.filters.jade ? 'jade' : 'html';
+              this.styleExt = this.filters.sass ? 'scss' : 
+                this.filters.less ? 'less' : 
+                this.filters.stylus ? 'styl' : 
+                'css';
             } else {
               this.filters = {};
               this.forceConfig = true;

Diff for: app/templates/_package.json

@@ -44,28 +44,31 @@
     "gulp-angular-templatecache": "^1.7.0",
     "gulp-autoprefixer": "2.3.1",<% if(filters.babel) { %>
     "gulp-babel": "^5.1.0",<% } %>
+    "gulp-babel-istanbul": "^0.11.0",
     "gulp-cache": "^0.2.10",
     "gulp-concat": "^2.6.0",
+    "gulp-env": "^0.2.0",
     "gulp-filter": "^2.0.2",
     "gulp-imagemin": "^2.2.1",
     "gulp-inject": "^1.3.1",
-    "gulp-jshint": "^1.11.0",<% if(filters.less) { %>
-    "gulp-less": "3.0.3",<% } %>
+    "gulp-jscs": "^3.0.2",
+    "gulp-jshint": "^1.11.0",
     "gulp-livereload": "^3.8.0",
     "gulp-load-plugins": "^1.0.0-rc.1",
     "gulp-minify-css": "^1.1.6",
     "gulp-mocha": "^2.1.3",
     "gulp-ng-annotate": "^1.1.0",
     "gulp-ng-constant": "^1.1.0",
     "gulp-plumber": "^1.0.1",
+    "gulp-protractor": "^2.1.0",
     "gulp-rename": "^1.2.2",
     "gulp-rev": "^5.0.0",
     "gulp-rev-replace": "^0.4.2",
     "gulp-sort": "^1.1.1",
     "gulp-sourcemaps": "^1.5.2",
     "gulp-svgmin": "^1.1.2",
     "gulp-uglify": "^1.2.0",
-    "gulp-useref": "^1.2.0",
+    "gulp-useref": "^3.0.3",
     "gulp-util": "^3.0.5",
     "gulp-watch": "^4.3.5",<% if(filters.jade) { %>
     "gulp-jade": "^1.0.1",<% } if(filters.stylus) { %>
@@ -75,9 +78,7 @@
     "gulp-sass": "^2.0.1",
     "gulp-scss-lint": "^0.2.1",<% } if(filters.less) { %>
     "gulp-less": "^3.0.3",
-    "gulp-recess": "^1.1.2",<% } if(filters.coffee) { %>
-    "gulp-coffeelint": "^0.5.0",
-    "gulp-coffee": "^2.3.1",<% } %>
+    "gulp-recess": "^1.1.2",<% } %>
     "utile": "~0.3.0",
     "nodemon": "^1.3.7",
     "run-sequence": "^1.1.0",

Diff for: app/templates/e2e/account(auth)/login/login.spec(jasmine).js

@@ -26,7 +26,14 @@ describe('Login View', function() {
            if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
       })
       .then(loadPage)
-      .finally(done);
+      .finally(function() {
+        browser.wait(function() {
+          //console.log('waiting for angular...');
+          return browser.executeScript('return !!window.angular');
+
+        }, 5000).then(done);
+
+      });
   });
 
   it('should include login form with correct inputs and submit button', function() {

Diff for: app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js

@@ -26,7 +26,11 @@ describe('Logout View', function() {
       .then(function() {
         return login(testUser);
       })
-      .finally(done);
+      .finally(function() {
+        browser.wait(function() {
+            return browser.executeScript('return !!window.angular');
+        }, 5000).then(done);
+      });
   });
 
   describe('with local auth', function() {

Diff for: app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js

@@ -20,8 +20,11 @@ describe('Signup View', function() {
     confirmPassword: 'test'
   };
 
-  beforeEach(function() {
+  beforeEach(function(done) {
     loadPage();
+    browser.wait(function() {
+        return browser.executeScript('return !!window.angular');
+    }, 5000).then(done);
   });
 
   it('should include signup form with correct inputs and submit button', function() {