Merge pull request angular-fullstack#1400 from DaftMonk/node-4.2.1

support node 4.2.2

Author: Awk34

.travis.yml

@@ -1,16 +1,15 @@
 sudo: false
 language: node_js
 node_js:
-  - '0.12'
-  - '4.0.0'
+  - 4.2.2
 env:
   global:
     - SAUCE_USERNAME=fullstack_ci
     - SAUCE_ACCESS_KEY=1a527ca6-4aa5-4618-86ce-0278bf158cbf
 matrix:
   fast_finish: true
   allow_failures:
-    - node_js: 4.0.0
+    - node_js: 5.0.0
 before_install:
   - ./scripts/sauce_connect_setup.sh
   - gem update --system

Gruntfile.js

@@ -292,8 +292,8 @@ module.exports = function (grunt) {
       child_process.exec('bower install', {cwd: '../fixtures'}, function (error, stdout, stderr) {
 
         if(!process.env.SAUCE_USERNAME) {
-          grunt.log.ok('running npm run update-webdriver');
-          child_process.exec('npm run update-webdriver', function() {
+          grunt.log.ok('running npm run-script update-webdriver');
+          child_process.exec('npm run-script update-webdriver', function() {
             shell.cd('../../');
             done();
           });

app/templates/.jscsrc

@@ -1,4 +1,7 @@
 {
+  "excludeFiles": [
+    "client/app/app.constant.js"
+  ],
   "esnext": true,
   "maximumLineLength": {
     "value": 100,

app/templates/.travis.yml

@@ -1,11 +1,10 @@
 language: node_js
 node_js:
-  - '0.12'
-  - '4.0.0'
+  - 4.2.2
 matrix:
   fast_finish: true
   allow_failures:
-    - node_js: 4.0.0
+    - node_js: 5.0.0
 before_script:
   - npm install -g bower grunt-cli<% if (filters.sass) { %>
   - gem install sass<% } %>

app/templates/_package.json

@@ -66,7 +66,7 @@
     "grunt-nodemon": "^0.4.0",
     "grunt-angular-templates": "^0.5.4",
     "grunt-dom-munger": "^3.4.0",
-    "grunt-protractor-runner": "^2.0.0",
+    "grunt-protractor-runner": "https://github.com/StoutLLC/grunt-protractor-runner",
     "grunt-injector": "^0.6.0",
     "grunt-karma": "~0.12.0",
     "grunt-build-control": "^0.6.0",<% if(filters.sass) { %>
@@ -111,7 +111,8 @@
     "supertest": "^1.1.0"
   },
   "engines": {
-    "node": ">=0.12.0"
+    "node": "^4.2.2",
+    "npm": "^2.14.7"
   },
   "scripts": {
     "start": "node server",

app/templates/e2e/account(auth)/login/login.po.js

@@ -20,7 +20,7 @@ var LoginPage = function() {
       }
     }
 
-    form.submit.click();
+    return form.submit.click();
   };
 };
 

app/templates/e2e/account(auth)/login/login.spec(mocha).js

@@ -8,8 +8,9 @@ describe('Login View', function() {
   var page;
 
   var loadPage = function() {
-    browser.get(config.baseUrl + '/login');
+    let promise = browser.get(config.baseUrl + '/login');
     page = require('./login.po');
+    return promise;
   };
 
   var testUser = {

app/templates/e2e/account(auth)/logout/logout.spec(mocha).js

@@ -6,8 +6,9 @@ var UserModel = require(config.serverConfig.root + '/server/sqldb').User;<% } %>
 
 describe('Logout View', function() {
   var login = function(user) {
-    browser.get(config.baseUrl + '/login');
+    let promise = browser.get(config.baseUrl + '/login');
     require('../login/login.po').login(user);
+    return promise;
   };
 
   var testUser = {

app/templates/e2e/account(auth)/signup/signup.po.js

@@ -22,7 +22,7 @@ var SignupPage = function() {
       }
     }
 
-    form.submit.click();
+    return form.submit.click();
   };
 };
 

app/templates/e2e/account(auth)/signup/signup.spec(mocha).js

@@ -9,8 +9,9 @@ describe('Signup View', function() {
 
   var loadPage = function() {
     browser.manage().deleteAllCookies()
-    browser.get(config.baseUrl + '/signup');
+    let promise = browser.get(config.baseUrl + '/signup');
     page = require('./signup.po');
+    return promise;
   };
 
   var testUser = {