From cdb313beb37e724a71ca04f080c8867dd9a206df Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 9 Oct 2017 07:29:30 -0700
Subject: [PATCH 1/2] fix: use createIndex() instead of deprecated
 ensureIndex()

Re: Automattic/mongoose#5692
---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 5d2c566..c90993b 100644
--- a/index.js
+++ b/index.js
@@ -48,7 +48,7 @@ module.exports = function(connect) {
 
       db.
         collection(options.collection).
-        ensureIndex({ expires: 1 }, { expireAfterSeconds: 0 }, function(error) {
+        createIndex({ expires: 1 }, { expireAfterSeconds: 0 }, function(error) {
           if (error) {
             var e = new Error('Error creating index: ' + error.message);
             return _this._errorHandler(e, callback);

From 981807ac16d8b01d2ad0516a57a417b475607eb9 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 9 Oct 2017 07:47:17 -0700
Subject: [PATCH 2/2] test: fix tests for createIndex usage

---
 test/unit.test.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/unit.test.js b/test/unit.test.js
index f1256f5..e272a92 100644
--- a/test/unit.test.js
+++ b/test/unit.test.js
@@ -11,7 +11,7 @@ describe('connectMongoDBSession', function() {
   beforeEach(function() {
     db = strawman({
       collection: { argumentNames: ['collection'], chain: true },
-      ensureIndex: { argumentNames: ['index', 'options', 'callback'] },
+      createIndex: { argumentNames: ['index', 'options', 'callback'] },
       findOne: { argumentNames: ['query', 'callback'] },
       remove: { argumentNames: ['query', 'callback'] },
       update: { argumentNames: ['query', 'update', 'options', 'callback' ] }
@@ -68,7 +68,7 @@ describe('connectMongoDBSession', function() {
   it('specifying options is optional', function(done) {
     var SessionStore = connectMongoDBSession({ Store: StoreStub });
     var numIndexCalls = 0;
-    db.ensureIndex.on('called', function(args) {
+    db.createIndex.on('called', function(args) {
       assert.equal(++numIndexCalls, 1);
       assert.equal(args.index.expires, 1);
       args.callback();
@@ -84,7 +84,7 @@ describe('connectMongoDBSession', function() {
   it('uses default options and no callback if no args passed', function(done) {
     var SessionStore = connectMongoDBSession({ Store: StoreStub });
     var numIndexCalls = 0;
-    db.ensureIndex.on('called', function(args) {
+    db.createIndex.on('called', function(args) {
       assert.equal(++numIndexCalls, 1);
       assert.equal(args.index.expires, 1);
       args.callback();
@@ -133,7 +133,7 @@ describe('connectMongoDBSession', function() {
   it('handles index errors', function(done) {
     var SessionStore = connectMongoDBSession({ Store: StoreStub });
     var numIndexCalls = 0;
-    db.ensureIndex.on('called', function(args) {
+    db.createIndex.on('called', function(args) {
       assert.equal(++numIndexCalls, 1);
       assert.equal(args.index.expires, 1);
       args.callback(new Error('Index fail'));
@@ -151,7 +151,7 @@ describe('connectMongoDBSession', function() {
     beforeEach(function() {
       numIndexCalls = 0;
 
-      db.ensureIndex.on('called', function(args) {
+      db.createIndex.on('called', function(args) {
         assert.equal(++numIndexCalls, 1);
         assert.equal(args.index.expires, 1);
         args.callback();
@@ -245,7 +245,7 @@ describe('connectMongoDBSession', function() {
     beforeEach(function() {
       numIndexCalls = 0;
 
-      db.ensureIndex.on('called', function(args) {
+      db.createIndex.on('called', function(args) {
         assert.equal(++numIndexCalls, 1);
         assert.equal(args.index.expires, 1);
         args.callback();
@@ -300,7 +300,7 @@ describe('connectMongoDBSession', function() {
     beforeEach(function() {
       numIndexCalls = 0;
 
-      db.ensureIndex.on('called', function(args) {
+      db.createIndex.on('called', function(args) {
         assert.equal(++numIndexCalls, 1);
         assert.equal(args.index.expires, 1);
         args.callback();
@@ -419,7 +419,7 @@ describe('connectMongoDBSession', function() {
     beforeEach(function() {
       numIndexCalls = 0;
 
-      db.ensureIndex.on('called', function(args) {
+      db.createIndex.on('called', function(args) {
         assert.equal(++numIndexCalls, 1);
         assert.equal(args.index.expires, 1);
         args.callback();