Merge branch 'maustand-master' of https://github.com/diegohaz/rest in…

…to fixes

.travis.yml

@@ -3,9 +3,7 @@ cache:
   directories:
     - node_modules
 node_js:
-- v4
-- v5
-- v6
+  - v7
 addons:
   apt:
     sources:

generators/app/templates/_package.json

@@ -22,14 +22,14 @@
     "apidoc": "^0.17.6",
     "apidoc-markdown": "^0.2.0",
     "babel-eslint": "^8.0.1",
-    "babel-jest": "^20.0.3",
+    "babel-jest": "^22.4.1",
     "cross-env": "^5.0.5",
-    "dotenv-safe": "^4.0.3",
+    "dotenv-safe": "^5.0.1",
     "eslint": "^4.4.1",
-    "eslint-config-standard": "^10.2.1",
+    "eslint-config-standard": "^11.0.0",
     "eslint-plugin-promise": "^3.0.0",
     "eslint-plugin-standard": "^3.0.1",
-    "jest-cli": "^20.0.4",
+    "jest-cli": "^22.4.3",
     "mockgoose": "^6.0.8",
     "nock": "^9.0.2",
     "nodemon": "^1.10.2",
@@ -58,7 +58,7 @@
     <%_ if (generateAuthApi) { _%>
     "jsonwebtoken": "^8.1.0",
     <%_ } _%>
-    "mongoose": "^4.12.4",
+    "mongoose": "^4.13.12",
     "mongoose-create-unique": "^0.4.4",
     "mongoose-keywords": "^0.3.2",
     "morgan": "^1.7.0",
@@ -74,8 +74,7 @@
     <%_ if (generateAuthApi) { _%>
     "rand-token": "^0.4.0",
     <%_ } _%>
-    "request": "^2.83.0",
-    "request-promise": "^4.2.2"
+    "request": "^2.83.0"
     <%_ if (typeof sendgridKey !== 'undefined' && sendgridKey) { _%>,
     "sendgrid": "^4.0.2"
     <%_ } _%>

generators/app/templates/test/setup.js

@@ -22,9 +22,10 @@ global.TypeError = TypeError
 global.parseInt = parseInt
 global.parseFloat = parseFloat
 
+
 beforeAll(async () => {
   await mockgoose(mongoose)
-  mongoose.connect(mongo.uri)
+  mongoose.connect(mongo.uri, { useMongoClient: true })
 })
 
 afterAll(() => {

package.json

@@ -33,8 +33,6 @@
   ],
   "dependencies": {
     "chalk": "^2.3.2",
-    "eslint-plugin-node": "^6.0.1",
-    "eslint-plugin-standard": "^2.3.1",
     "lodash": "^4.15.0",
     "pluralize": "^7.0.0",
     "rand-token": "^0.4.0",
@@ -52,13 +50,14 @@
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-1": "^6.24.1",
     "babel-runtime": "^6.26.0",
-    "bcrypt": "^1.0.2",
+    "bcrypt": "^1.0.3",
     "body-parser": "^1.18.2",
     "bodymen": "^1.0.3",
     "compression": "^1.7.1",
     "cors": "^2.8.4",
     "dotenv-safe": "^5.0.1",
     "eslint": "^4.4.1",
+    "eslint-plugin-node": "^6.0.1",
     "eslint-config-standard": "^11.0.0",
     "eslint-config-xo-space": "^0.18.0",
     "eslint-plugin-import": "^2.8.0",
@@ -78,8 +77,8 @@
     "gulp-plumber": "^1.0.0",
     "jest-cli": "^22.4.2",
     "jsonwebtoken": "^8.1.0",
-    "mockgoose": "^7.3.5",
-    "mongoose": "^5.0.9",
+    "mockgoose": "^6.0.8",
+    "mongoose": "^4.13.12",
     "mongoose-create-unique": "^0.4.4",
     "mongoose-keywords": "^0.3.2",
     "morgan": "^1.7.0",