Merge pull request #18 from Ben305/support-mongoose-5

Support mongoose 5.0.x
drudge · Feb 28, 2018 · 17d6cbd · 17d6cbd
2 parents 06af724 + b3bb08f
commit 17d6cbd
Show file tree

Hide file tree

Showing 5 changed files with 401 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,9 @@
 language: "node_js"
 node_js:
+  - "8"
   - "7"
   - "6"
   - "5"
   - "4"
-  - 'iojs'
-  - '0.12'
-  - "0.10"
 services:
   - mongodb
diff --git a/index.js b/index.js
@@ -7,7 +7,8 @@
 function findOrCreatePlugin(schema, options) {
   schema.statics.findOrCreate = function findOrCreate(conditions, doc, options, callback) {
     var self = this;
-    var Promise = self.base.Promise.ES6;
+    // When using Mongoose 5.0.x and upper, we must use self.base.Promise
+    var Promise = self.base.Promise.ES6 ? self.base.Promise.ES6 : self.base.Promise;
     if (arguments.length < 4) {
       if (typeof options === 'function') {
         // Scenario: findOrCreate(conditions, doc, callback)

diff --git a/package-lock.json b/package-lock.json