From 019d7a7d62f879f0dbc35b7c189a4ca8ece11d48 Mon Sep 17 00:00:00 2001
From: Neal Beeken <neal.beeken@mongodb.com>
Date: Fri, 11 Mar 2022 13:37:22 -0500
Subject: [PATCH] daria's comments

---
 global.d.ts                                   |  1 -
 .../retryable_writes.spec.prose.test.ts       |  2 +-
 test/unit/error.test.ts                       | 23 +++++++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/global.d.ts b/global.d.ts
index 4e1e26ec33..145acdf283 100644
--- a/global.d.ts
+++ b/global.d.ts
@@ -51,7 +51,6 @@ declare global {
     interface Test {
       metadata: MongoDBMetadataUI;
 
-      /** @deprecated Attach spec to a test if you need access to it in a beforeEach hook, not recommended?? */
       spec: Record<string, any>;
     }
 
diff --git a/test/integration/retryable-writes/retryable_writes.spec.prose.test.ts b/test/integration/retryable-writes/retryable_writes.spec.prose.test.ts
index 00d5c69fce..2171885f85 100644
--- a/test/integration/retryable-writes/retryable_writes.spec.prose.test.ts
+++ b/test/integration/retryable-writes/retryable_writes.spec.prose.test.ts
@@ -53,7 +53,7 @@ describe('Retryable Writes Spec Prose', () => {
       .catch(error => error);
 
     expect(error).to.exist;
-    expect(error).to.be.instanceOf(MongoServerError);
+    expect(error).that.is.instanceOf(MongoServerError);
     expect(error).to.have.property('originalError').that.instanceOf(MongoError);
     expect(error.originalError).to.have.property('code', 20);
     expect(error).to.have.property(
diff --git a/test/unit/error.test.ts b/test/unit/error.test.ts
index c7a6b48524..ff3337c11a 100644
--- a/test/unit/error.test.ts
+++ b/test/unit/error.test.ts
@@ -406,6 +406,9 @@ describe('MongoErrors', () => {
       // 8 - below server version 4.4
       // 9 - above server version 4.4
 
+      const ABOVE_4_4 = 9;
+      const BELOW_4_4 = 8;
+
       const tests: {
         description: string;
         result: boolean;
@@ -416,25 +419,25 @@ describe('MongoErrors', () => {
           description: 'a plain error',
           result: false,
           error: new Error('do not retry me!'),
-          maxWireVersion: 8
+          maxWireVersion: BELOW_4_4
         },
         {
           description: 'a MongoError with no code nor label',
           result: false,
           error: new MongoError('do not retry me!'),
-          maxWireVersion: 8
+          maxWireVersion: BELOW_4_4
         },
         {
           description: 'network error',
           result: true,
           error: new MongoNetworkError('socket bad, try again'),
-          maxWireVersion: 8
+          maxWireVersion: BELOW_4_4
         },
         {
           description: 'a MongoWriteConcernError with no code nor label',
           result: false,
           error: new MongoWriteConcernError({ message: 'empty wc error' }),
-          maxWireVersion: 8
+          maxWireVersion: BELOW_4_4
         },
         {
           description: 'a MongoWriteConcernError with a random label',
@@ -443,31 +446,31 @@ describe('MongoErrors', () => {
             { message: 'random label' },
             { errorLabels: ['myLabel'] }
           ),
-          maxWireVersion: 8
+          maxWireVersion: BELOW_4_4
         },
         {
           description: 'a MongoWriteConcernError with a retryable code above server 4.4',
           result: false,
           error: new MongoWriteConcernError({}, { code: 262 }),
-          maxWireVersion: 9
+          maxWireVersion: ABOVE_4_4
         },
         {
           description: 'a MongoWriteConcernError with a retryable code below server 4.4',
           result: true,
           error: new MongoWriteConcernError({}, { code: 262 }),
-          maxWireVersion: 8
+          maxWireVersion: BELOW_4_4
         },
         {
           description: 'a MongoWriteConcernError with a RetryableWriteError label below server 4.4',
           result: true,
           error: new MongoWriteConcernError({}, { errorLabels: ['RetryableWriteError'] }),
-          maxWireVersion: 8
+          maxWireVersion: BELOW_4_4
         },
         {
           description: 'a MongoWriteConcernError with a RetryableWriteError label above server 4.4',
           result: false,
           error: new MongoWriteConcernError({}, { errorLabels: ['RetryableWriteError'] }),
-          maxWireVersion: 9
+          maxWireVersion: ABOVE_4_4
         },
         {
           description: 'any MongoError with a RetryableWriteError label',
@@ -479,7 +482,7 @@ describe('MongoErrors', () => {
             error.addErrorLabel('RetryableWriteError');
             return error;
           })(),
-          maxWireVersion: 9
+          maxWireVersion: ABOVE_4_4
         }
       ];
       for (const { description, result, error, maxWireVersion } of tests) {