Merge pull request #9598 from AbdelrahmanHafez/gh-9597

fix(connection): connect and disconnect can be used destructured re #9597
Automattic · Nov 29, 2020 · c956bc2 · c956bc2
2 parents 5d7a28d + 5ff54cc
commit c956bc2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -338,7 +338,7 @@ Mongoose.prototype.connect = function(uri, options, callback) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
   const conn = _mongoose.connection;
 
-  return this._promiseOrCallback(callback, cb => {
+  return _mongoose._promiseOrCallback(callback, cb => {
     conn.openUri(uri, options, err => {
       if (err != null) {
         return cb(err);
@@ -359,7 +359,7 @@ Mongoose.prototype.connect = function(uri, options, callback) {
 Mongoose.prototype.disconnect = function(callback) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
-  return this._promiseOrCallback(callback, cb => {
+  return _mongoose._promiseOrCallback(callback, cb => {
     let remaining = _mongoose.connections.length;
     if (remaining <= 0) {
       return cb(null);

diff --git a/test/connection.test.js b/test/connection.test.js
@@ -1239,4 +1239,18 @@ describe('connections:', function() {
     });
   });
 
+
+  it('can use destructured `connect` and `disconnect` (gh-9597)', function() {
+    return co(function* () {
+      const m = new mongoose.Mongoose;
+      const connect = m.connect;
+      const disconnect = m.disconnect;
+
+      const errorOnConnect = yield connect('mongodb://localhost:27017/test_gh9597').then(() => null, err => err);
+      assert.ifError(errorOnConnect);
+
+      const errorOnDisconnect = yield disconnect().then(() => null, err => err);
+      assert.ifError(errorOnDisconnect);
+    });
+  });
 });