comments

src/db.ts

@@ -408,21 +408,21 @@ export class Db {
    * Add a user to the database
    *
    * @param username - The username for the new user
-   * @param password - An optional password for the new user
+   * @param passwordOrOptions - An optional password for the new user, or the options for the command
    * @param options - Optional settings for the command
    */
   async addUser(
     username: string,
-    password?: string | AddUserOptions,
+    passwordOrOptions?: string | AddUserOptions,
     options?: AddUserOptions
   ): Promise<Document> {
     options =
       options != null && typeof options === 'object'
         ? options
-        : password != null && typeof password === 'object'
-        ? password
+        : passwordOrOptions != null && typeof passwordOrOptions === 'object'
+        ? passwordOrOptions
         : undefined;
-    password = typeof password === 'string' ? password : undefined;
+    const password = typeof passwordOrOptions === 'string' ? passwordOrOptions : undefined;
     return executeOperation(
       this.s.client,
       new AddUserOperation(this, username, password, resolveOptions(this, options))

test/integration/crud/find_cursor_methods.test.js

@@ -204,50 +204,35 @@ describe('Find Cursor', function () {
     });
   });
 
-  // TODO(NODE-4988): Need to fix cursor.clone in mongodb-legacy
-  context.skip('#clone', function () {
-    it('should clone a find cursor', function (done) {
+  context('#clone', function () {
+    it('should clone a find cursor', async function () {
+      // TODO(NODE-4988): Need to fix cursor.clone in mongodb-legacy, callbacks do not work on cloned cursor
       const coll = client.db().collection('abstract_cursor');
       const cursor = coll.find({});
-      this.defer(() => cursor.close());
-
-      cursor.toArray((err, docs) => {
-        expect(err).to.not.exist;
-        expect(docs).to.have.length(6);
-        expect(cursor).property('closed').to.be.true;
 
-        const clonedCursor = cursor.clone();
-        this.defer(() => clonedCursor.close());
+      const docsFromOriginal = await cursor.toArray();
+      expect(docsFromOriginal).to.have.length(6);
+      expect(cursor).property('closed').to.be.true;
 
-        clonedCursor.toArray((err, docs) => {
-          expect(err).to.not.exist;
-          expect(docs).to.have.length(6);
-          expect(clonedCursor).property('closed').to.be.true;
-          done();
-        });
-      });
+      const clonedCursor = cursor.clone();
+      const docsFromCloned = await clonedCursor.toArray();
+      expect(docsFromCloned).to.have.length(6);
+      expect(cursor).property('closed').to.be.true;
     });
 
-    it('should clone an aggregate cursor', function (done) {
+    it('should clone an aggregate cursor', async function () {
+      // TODO(NODE-4988): Need to fix cursor.clone in mongodb-legacy, callbacks do not work on cloned cursor
       const coll = client.db().collection('abstract_cursor');
       const cursor = coll.aggregate([{ $match: {} }]);
-      this.defer(() => cursor.close());
-
-      cursor.toArray((err, docs) => {
-        expect(err).to.not.exist;
-        expect(docs).to.have.length(6);
-        expect(cursor).property('closed').to.be.true;
 
-        const clonedCursor = cursor.clone();
-        this.defer(() => clonedCursor.close());
+      const docsFromOriginal = await cursor.toArray();
+      expect(docsFromOriginal).to.have.length(6);
+      expect(cursor).property('closed').to.be.true;
 
-        clonedCursor.toArray((err, docs) => {
-          expect(err).to.not.exist;
-          expect(docs).to.have.length(6);
-          expect(clonedCursor).property('closed').to.be.true;
-          done();
-        });
-      });
+      const clonedCursor = cursor.clone();
+      const docsFromCloned = await clonedCursor.toArray();
+      expect(docsFromCloned).to.have.length(6);
+      expect(cursor).property('closed').to.be.true;
     });
   });
 

test/integration/crud/misc_cursors.test.js

@@ -1671,66 +1671,28 @@ describe('Cursor', function () {
     }
   });
 
-  // TODO(NODE-4988): Need to fix cursor.clone in mongodb-legacy
-  it.skip('removes session wheen cloning a find cursor', function (done) {
-    const configuration = this.configuration;
-    client.connect((err, client) => {
-      expect(err).to.not.exist;
-
-      const db = client.db(configuration.db);
-      db.createCollection('clone_find_cursor_session', (err, collection) => {
-        expect(err).to.not.exist;
+  it('removes session when cloning an aggregation cursor', async function () {
+    // TODO(NODE-4988): Need to fix cursor.clone in mongodb-legacy, callbacks do not work on cloned cursor
+    const collection = await client.db().collection();
 
-        collection.insertOne({ a: 1 }, configuration.writeConcernMax(), err => {
-          expect(err).to.not.exist;
+    const cursor = collection.find({});
+    const clonedCursor = cursor.clone();
 
-          const cursor = collection.find();
-          const clonedCursor = cursor.clone();
-          cursor.toArray(err => {
-            expect(err).to.not.exist;
-            clonedCursor.toArray(err => {
-              expect(err).to.not.exist;
-              client.close();
-              done();
-            });
-          });
-        });
-      });
-    });
+    expect(cursor).to.have.property('session');
+    expect(clonedCursor).to.have.property('session');
+    expect(cursor.session).to.not.equal(clonedCursor.session);
   });
 
-  // TODO(NODE-4988): Need to fix cursor.clone in mongodb-legacy
-  it.skip('removes session wheen cloning an aggregation cursor', {
-    metadata: {
-      requires: { topology: ['single', 'replicaset', 'sharded'] }
-    },
-
-    test: function (done) {
-      const configuration = this.configuration;
-      client.connect((err, client) => {
-        expect(err).to.not.exist;
-
-        const db = client.db(configuration.db);
-        db.createCollection('clone_aggregation_cursor_session', (err, collection) => {
-          expect(err).to.not.exist;
+  it('removes session when cloning an aggregation cursor', async function () {
+    // TODO(NODE-4988): Need to fix cursor.clone in mongodb-legacy, callbacks do not work on cloned cursor
+    const collection = await client.db().collection();
 
-          collection.insertOne({ a: 1 }, configuration.writeConcernMax(), err => {
-            expect(err).to.not.exist;
+    const cursor = collection.aggregate([{ $match: {} }]);
+    const clonedCursor = cursor.clone();
 
-            const cursor = collection.aggregate([{ $match: { a: 1 } }]);
-            const clonedCursor = cursor.clone();
-            cursor.toArray(err => {
-              expect(err).to.not.exist;
-              clonedCursor.toArray(err => {
-                expect(err).to.not.exist;
-                client.close();
-                done();
-              });
-            });
-          });
-        });
-      });
-    }
+    expect(cursor).to.have.property('session');
+    expect(clonedCursor).to.have.property('session');
+    expect(cursor.session).to.not.equal(clonedCursor.session);
   });
 
   it('destroying a stream stops it', {