chore(deps): bump mongodb to 4.0.0-beta.6

addaleax · addaleax · commit 1646c218947c · 2021-07-02T14:39:41.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -119,7 +119,7 @@
     "karma-typescript": "^5.5.1",
     "lerna": "^4.0.0",
     "mocha": "^7.1.2",
-    "mongodb": "4.0.0-beta.5",
+    "mongodb": "4.0.0-beta.6",
     "mongodb-download-url": "^1.0.1",
     "mongodb-js-precommit": "^2.0.0",
     "nock": "^13.0.11",
diff --git a/packages/cli-repl/test/e2e-auth.spec.ts b/packages/cli-repl/test/e2e-auth.spec.ts
@@ -982,7 +982,7 @@ describe('Auth e2e', function() {
           '--authenticationMechanism', 'SCRAM-SHA-1'
         ] });
         await eventually(() => {
-          shell.assertContainsOutput('MongoError: Authentication failed.');
+          shell.assertContainsOutput('MongoServerError: Authentication failed.');
         });
       });
       it('cannot auth when authenticationMechanism mismatches (sha1 -> sha256)', async() => {
@@ -995,7 +995,7 @@ describe('Auth e2e', function() {
           '--authenticationMechanism', 'SCRAM-SHA-256'
         ] });
         await eventually(() => {
-          shell.assertContainsOutput('MongoError: Authentication failed.');
+          shell.assertContainsOutput('MongoServerError: Authentication failed.');
         });
       });
       it('does not fail with kerberos not found for GSSAPI', async() => {
diff --git a/packages/cli-repl/test/e2e-direct.spec.ts b/packages/cli-repl/test/e2e-direct.spec.ts
@@ -95,7 +95,7 @@ describe('e2e direct connection', () => {
           await shell.waitForPrompt();
           await shell.executeLine('use admin');
           await shell.executeLine('db.runCommand({ listCollections: 1 })');
-          shell.assertContainsError('MongoError: not primary');
+          shell.assertContainsError('MongoServerError: not primary');
         });
 
         it('lists collections when readPreference is in the connection string', async() => {
diff --git a/packages/cli-repl/test/e2e.spec.ts b/packages/cli-repl/test/e2e.spec.ts
@@ -893,9 +893,10 @@ describe('e2e', function() {
         const shell = TestShell.start({ args: [
           `${await testServer.connectionString()}/${dbName}`, '--apiVersion', '1'
         ] });
-        await shell.waitForPrompt();
-        expect(await shell.executeLine('db.coll.find().toArray()'))
-          .to.include("Unrecognized field 'apiVersion'");
+        if ((await shell.waitForPromptOrExit()).state === 'prompt') {
+          await shell.executeLine('db.coll.find().toArray()');
+        }
+        expect(shell.output).to.match(/MongoServer(Selection)?Error/);
       });
     });
 
diff --git a/packages/cli-repl/test/test-shell.ts b/packages/cli-repl/test/test-shell.ts
@@ -158,8 +158,8 @@ export class TestShell {
 
   async waitForPromptOrExit(): Promise<TestShellStartupResult> {
     return Promise.race([
-      this.waitForPrompt().then(() => ({ state: 'prompt' } as TestShellStartupResult)),
-      this.waitForExit().then(c => ({ state: 'exit', exitCode: c }) as TestShellStartupResult),
+      this.waitForPrompt().then(() => ({ state: 'prompt' }) as const),
+      this.waitForExit().then(c => ({ state: 'exit', exitCode: c }) as const),
     ]);
   }
 
diff --git a/packages/service-provider-core/package-lock.json b/packages/service-provider-core/package-lock.json
diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json
@@ -30,7 +30,7 @@
     "@mongosh/errors": "0.0.0-dev.0",
     "@mongosh/i18n": "0.0.0-dev.0",
     "bson": "^4.4.0",
-    "mongodb": "4.0.0-beta.5",
+    "mongodb": "4.0.0-beta.6",
     "mongodb-build-info": "^1.2.0",
     "mongodb-connection-string-url": "^1.0.0"
   },
diff --git a/packages/service-provider-server/package-lock.json b/packages/service-provider-server/package-lock.json
diff --git a/packages/service-provider-server/package.json b/packages/service-provider-server/package.json
@@ -41,7 +41,7 @@
     "@mongosh/errors": "0.0.0-dev.0",
     "@mongosh/service-provider-core": "0.0.0-dev.0",
     "@types/sinon-chai": "^3.2.3",
-    "mongodb": "4.0.0-beta.5",
+    "mongodb": "4.0.0-beta.6",
     "saslprep": "mongodb-js/saslprep#v1.0.4",
     "mongodb-connection-string-url": "^1.0.0"
   },
diff --git a/packages/service-provider-server/src/cli-service-provider.integration.spec.ts b/packages/service-provider-server/src/cli-service-provider.integration.spec.ts
@@ -73,7 +73,7 @@ describe('CliServiceProvider [integration]', function() {
         await serviceProvider.runCommandWithCheck('admin', { ping: 1 });
         expect.fail('missed exception');
       } catch (err) {
-        expect(err.name).to.equal('MongoError');
+        expect(err.name).to.equal('MongoDriverError');
       }
       await reconnect();
       await serviceProvider.runCommandWithCheck('admin', { ping: 1 });
diff --git a/packages/shell-api/src/integration.spec.ts b/packages/shell-api/src/integration.spec.ts
@@ -1759,7 +1759,7 @@ describe('Shell API (integration)', function() {
             try {
               await bulk.execute();
             } catch (err) {
-              expect(err.name).to.equal('MongoError');
+              expect(err.name).to.equal('MongoDriverError');
               return;
             }
             expect.fail('Error not thrown');
diff --git a/packages/shell-api/src/mongo.spec.ts b/packages/shell-api/src/mongo.spec.ts
@@ -726,16 +726,15 @@ describe('Mongo', () => {
         skipIfServerVersion(testServer, '> 4.4');
 
         it('errors if an API version is specified', async() => {
-          // eslint-disable-next-line new-cap
-          const mongo = await internalState.shellApi.Mongo(uri, null, {
-            api: { version: '1' }
-          });
-          expect(mongo._apiOptions).to.deep.equal({ version: '1' });
           try {
+            // eslint-disable-next-line new-cap
+            const mongo = await internalState.shellApi.Mongo(uri, null, {
+              api: { version: '1' }
+            });
             await mongo.getDB('test').getCollection('coll').find().toArray();
             expect.fail('missed exception');
           } catch (err) {
-            expect(err.message).to.include("Unrecognized field 'apiVersion'");
+            expect(err.name).to.match(/MongoServer(Selection)?Error/);
           }
         });
       });
diff --git a/packages/shell-api/src/shard.spec.ts b/packages/shell-api/src/shard.spec.ts
@@ -1247,13 +1247,15 @@ describe('Shard', () => {
         let apiStrictServiceProvider;
 
         before(async() => {
-          apiStrictServiceProvider = await CliServiceProvider.connect(await mongos.connectionString(), {
-            serverApi: { version: '1', strict: true }
-          });
+          try {
+            apiStrictServiceProvider = await CliServiceProvider.connect(await mongos.connectionString(), {
+              serverApi: { version: '1', strict: true }
+            });
+          } catch { /* Fails to connect to servers which do not understand api versions */ }
         });
 
         after(async() => {
-          await apiStrictServiceProvider.close(true);
+          await apiStrictServiceProvider?.close?.(true);
         });
 
         it('returns the status when used with apiStrict', async() => {

Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,8 @@ export class TestShell {`
`158`	`158`
`159`	`159`	`async waitForPromptOrExit(): Promise<TestShellStartupResult> {`
`160`	`160`	`return Promise.race([`
`161`		`- this.waitForPrompt().then(() => ({ state: 'prompt' } as TestShellStartupResult)),`
`162`		`- this.waitForExit().then(c => ({ state: 'exit', exitCode: c }) as TestShellStartupResult),`
	`161`	`+ this.waitForPrompt().then(() => ({ state: 'prompt' }) as const),`
	`162`	`+ this.waitForExit().then(c => ({ state: 'exit', exitCode: c }) as const),`
`163`	`163`	`]);`
`164`	`164`	`}`
`165`	`165`