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

Author: Awk34

Diff for: package.json

@@ -87,7 +87,7 @@
     "shelljs": "^0.7.0",
     "should": "^11.1.0",
     "yeoman-assert": "^2.0.0",
-    "yeoman-test": "~1.4.0"
+    "yeoman-test": "~1.5.0"
   },
   "engines": {
     "node": "^6.2.2",

Diff for: templates/app/karma.conf.js

@@ -47,7 +47,6 @@ module.exports = function(config) {
     },
 
     plugins: [
-      require('karma-chai-plugins'),
       require('karma-chrome-launcher'),
       require('karma-coverage'),
       require('karma-firefox-launcher'),

Diff for: templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js

@@ -8,6 +8,9 @@ export function setup(User, config) {
     callbackURL: config.twitter.callbackURL
   },
   function(token, tokenSecret, profile, done) {
+    profile._json.id = `${profile._json.id}`;
+    profile.id = `${profile.id}`;
+
     <% if(filters.mongooseModels) { %>User.findOne({'twitter.id': profile.id}).exec()<% }
        if(filters.sequelizeModels) { %>User.find({where:{'twitter.id': profile.id}})<% } %>
       .then(user => {

Diff for: templates/app/server/config/environment/production.js

@@ -11,7 +11,7 @@ module.exports = {
 
   // Server port
   port: process.env.OPENSHIFT_NODEJS_PORT
-    || process.env.port
+    || process.env.PORT
     || <%= prodPort %><% if(filters.mongoose) { %>,
 
   // MongoDB connection options

Diff for: templates/endpoint/basename.controller.js

@@ -101,7 +101,7 @@ export function upsert(req, res) {
     delete req.body._id;
   }
   <%_ if(filters.mongooseModels) { -%>
-  return <%= classedName %>.findOneAndUpdate(req.params.id, req.body, {upsert: true, setDefaultsOnInsert: true, runValidators: true}).exec()<% } %>
+  return <%= classedName %>.findOneAndUpdate({_id: req.params.id}, req.body, {upsert: true, setDefaultsOnInsert: true, runValidators: true}).exec()<% } %>
   <%_ if(filters.sequelizeModels) { -%>
   return <%= classedName %>.upsert(req.body, {
     where: {