Merge pull request #47 from mongodb-js/vkarpov15-patch-1

fix: use createIndex() instead of deprecated ensureIndex()
mongodb-js · Oct 9, 2017 · 0e8d9ba · 0e8d9ba
2 parents 107e767 + 981807a
commit 0e8d9ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git 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);

diff --git 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();