test: remove remove usage

Author: nbbeeken

test/integration/collection-management/collection.test.ts

@@ -235,7 +235,7 @@ describe('Collection', function () {
           expect(err).to.not.exist;
           collection.insertOne({ c: 1 }, configuration.writeConcernMax(), err => {
             expect(err).to.not.exist;
-            collection.remove({ a: 1 }, configuration.writeConcernMax(), err => {
+            collection.deleteMany({ a: 1 }, configuration.writeConcernMax(), err => {
               expect(err).to.not.exist;
               // Let's perform a count
               collection.countDocuments((err, count) => {

test/integration/crud/crud_api.test.ts

@@ -666,27 +666,6 @@ describe('CRUD API', function () {
       client.connect(function (err, client) {
         const db = client.db();
 
-        //
-        // Legacy update method
-        // -------------------------------------------------
-        const legacyRemove = function () {
-          db.collection('t4_1').insertMany(
-            [{ a: 1 }, { a: 1 }],
-            { writeConcern: { w: 1 } },
-            function (err, r) {
-              expect(err).to.not.exist;
-              test.equal(2, r.insertedCount);
-
-              db.collection('t4_1').remove({ a: 1 }, { single: true }, function (err, r) {
-                expect(err).to.not.exist;
-                test.equal(1, r.deletedCount);
-
-                deleteOne();
-              });
-            }
-          );
-        };
-
         //
         // Update one method
         // -------------------------------------------------
@@ -728,8 +707,6 @@ describe('CRUD API', function () {
             }
           );
         };
-
-        legacyRemove();
       });
     }
   });

test/integration/crud/insert.test.js

@@ -325,7 +325,7 @@ describe('crud - insert', function () {
           db.createCollection(
             'users',
             getResult(function (user_collection) {
-              user_collection.remove({}, configuration.writeConcernMax(), function (err) {
+              user_collection.deleteMany({}, configuration.writeConcernMax(), function (err) {
                 expect(err).to.not.exist;
 
                 //first, create a user object
@@ -806,7 +806,7 @@ describe('crud - insert', function () {
                 expect(err).to.not.exist;
                 test.ok(result);
 
-                collection.remove(
+                collection.deleteMany(
                   { a: 2 },
                   configuration.writeConcernMax(),
                   function (err, result) {
@@ -1522,7 +1522,7 @@ describe('crud - insert', function () {
         client.connect(function (err, client) {
           var db = client.db(configuration.db);
           var collection = db.collection('gh-completely1');
-          collection.remove({ a: 1 }, { writeConcern: { w: 0 } }, cb);
+          collection.deleteMany({ a: 1 }, { writeConcern: { w: 0 } }, cb);
         });
       }
     });

test/integration/crud/remove.test.js

@@ -35,7 +35,7 @@ describe('Remove', function () {
               expect(count).to.equal(2);
 
               // Clear the collection
-              collection.remove({}, { writeConcern: { w: 1 } }, function (err, r) {
+              collection.deleteMany({}, { writeConcern: { w: 1 } }, function (err, r) {
                 expect(err).to.not.exist;
                 expect(r).property('deletedCount').to.equal(2);
 
@@ -81,7 +81,7 @@ describe('Remove', function () {
               expect(err).to.not.exist;
 
               // Clear the collection
-              collection.remove(
+              collection.deleteMany(
                 { address: /485 7th ave/ },
                 { writeConcern: { w: 1 } },
                 function (err, r) {
@@ -130,7 +130,7 @@ describe('Remove', function () {
               expect(err).to.not.exist;
 
               // Remove the first
-              collection.remove(
+              collection.deleteMany(
                 { a: 1 },
                 { writeConcern: { w: 1 }, single: true },
                 function (err, r) {

test/integration/node-specific/auto_connect.test.ts

@@ -483,15 +483,6 @@ describe('When executing an operation for the first time', () => {
       });
     });
 
-    describe(`#insert()`, () => {
-      it('should connect the client', async () => {
-        const c = client.db().collection('test');
-        // @ts-expect-error: deprecated API
-        await c.insert({ a: 1 });
-        expect(client).to.have.property('topology').that.is.instanceOf(Topology);
-      });
-    });
-
     describe(`#insertMany()`, () => {
       it('should connect the client', async () => {
         const c = client.db().collection('test');
@@ -542,15 +533,6 @@ describe('When executing an operation for the first time', () => {
       });
     });
 
-    describe(`#remove()`, () => {
-      it('should connect the client', async () => {
-        const c = client.db().collection('test');
-        // @ts-expect-error: deprecated API
-        await c.remove({ a: 1 });
-        expect(client).to.have.property('topology').that.is.instanceOf(Topology);
-      });
-    });
-
     describe(`#rename()`, () => {
       it('should connect the client', async () => {
         const c = client.db().collection('test0');
@@ -575,15 +557,6 @@ describe('When executing an operation for the first time', () => {
       });
     });
 
-    describe(`#update()`, () => {
-      it('should connect the client', async () => {
-        const c = client.db().collection('test');
-        // @ts-expect-error: deprecated API
-        await c.update({ a: 1 }, { $set: { a: 2 } });
-        expect(client).to.have.property('topology').that.is.instanceOf(Topology);
-      });
-    });
-
     describe(`#updateMany()`, () => {
       it('should connect the client', async () => {
         const c = client.db().collection('test');

test/tools/runner/hooks/legacy.ts

@@ -1,9 +1,15 @@
 import { Collection } from '../../../../src';
 
 // Setup legacy shims for tests that use removed or changed APIs
+const counts = {
+  insert: 0,
+  update: 0,
+  remove: 0
+};
 
 // @ts-expect-error: Method no longer exists on Collection
 Collection.prototype.insert = function (docs, options, callback) {
+  counts.insert += 1;
   callback =
     typeof callback === 'function' ? callback : typeof options === 'function' ? options : undefined;
   options = options != null && typeof options === 'object' ? options : { ordered: false };
@@ -15,18 +21,14 @@ Collection.prototype.insert = function (docs, options, callback) {
 
 // @ts-expect-error: Method no longer exists on Collection
 Collection.prototype.update = function (filter, update, options, callback) {
+  counts.update += 1;
   callback =
     typeof callback === 'function' ? callback : typeof options === 'function' ? options : undefined;
   options = options != null && typeof options === 'object' ? options : {};
 
   return this.updateMany(filter, update, options, callback);
 };
 
-// @ts-expect-error: Method no longer exists on Collection
-Collection.prototype.remove = function (filter, options, callback) {
-  callback =
-    typeof callback === 'function' ? callback : typeof options === 'function' ? options : undefined;
-  options = options != null && typeof options === 'object' ? options : {};
-
-  return this.deleteMany(filter, options, callback);
-};
+process.on('beforeExit', () => {
+  console.dir(counts);
+});