clean up fixmes

Author: emadum

test/functional/collations.test.js

@@ -1,9 +1,7 @@
 'use strict';
 const setupDatabase = require('./shared').setupDatabase;
 const mock = require('mongodb-mock-server');
-const chai = require('chai');
-chai.use(require('chai-subset'));
-const expect = chai.expect;
+const expect = require('chai').expect;
 
 const testContext = {};
 describe('Collation', function() {
@@ -680,7 +678,8 @@ describe('Collation', function() {
           .collection('test')
           .createIndex({ a: 1 }, { collation: { caseLevel: true } })
           .then(() => {
-            expect(commandResult).to.containSubset({
+            delete commandResult.apiVersion;
+            expect(commandResult).to.eql({
               createIndexes: 'test',
               indexes: [{ name: 'a_1', key: { a: 1 }, collation: { caseLevel: true } }]
             });

test/functional/crud_spec.test.js

@@ -488,12 +488,6 @@ describe('CRUD unified', function() {
         it(String(test.description), {
           metadata: { sessions: { skipLeakTests: true } },
           test() {
-            // FIXME(NODE-3191)
-            if (
-              test.description.match(/^estimatedDocumentCount errors correctly on 4.9.0 or greater/)
-            ) {
-              return this.skip();
-            }
             return runUnifiedTest(this, crudSpecTest, test);
           }
         });

test/functional/max_staleness.test.js

@@ -1,8 +1,6 @@
 'use strict';
 const Long = require('bson').Long;
-const chai = require('chai');
-const expect = chai.expect;
-chai.use(require('chai-subset'));
+const expect = require('chai').expect;
 const mock = require('mongodb-mock-server');
 
 const test = {};
@@ -66,7 +64,8 @@ describe('Max Staleness', function() {
           .find({})
           .toArray(function(err) {
             expect(err).to.not.exist;
-            expect(test.checkCommand).to.containSubset({
+            delete test.checkCommand.apiVersion;
+            expect(test.checkCommand).to.eql({
               $query: { find: 'test', filter: {}, returnKey: false, showRecordId: false },
               $readPreference: { mode: 'secondary', maxStalenessSeconds: 250 }
             });
@@ -104,7 +103,8 @@ describe('Max Staleness', function() {
           .find({})
           .toArray(function(err) {
             expect(err).to.not.exist;
-            expect(test.checkCommand).to.containSubset({
+            delete test.checkCommand.apiVersion;
+            expect(test.checkCommand).to.eql({
               $query: { find: 'test', filter: {}, returnKey: false, showRecordId: false },
               $readPreference: { mode: 'secondary', maxStalenessSeconds: 250 }
             });
@@ -142,7 +142,8 @@ describe('Max Staleness', function() {
             .find({})
             .toArray(function(err) {
               expect(err).to.not.exist;
-              expect(test.checkCommand).to.containSubset({
+              delete test.checkCommand.apiVersion;
+              expect(test.checkCommand).to.eql({
                 $query: { find: 'test', filter: {}, returnKey: false, showRecordId: false },
                 $readPreference: { mode: 'secondary', maxStalenessSeconds: 250 }
               });
@@ -179,7 +180,8 @@ describe('Max Staleness', function() {
           .setReadPreference(readPreference)
           .toArray(function(err) {
             expect(err).to.not.exist;
-            expect(test.checkCommand).to.containSubset({
+            delete test.checkCommand.apiVersion;
+            expect(test.checkCommand).to.eql({
               $query: { find: 'test', filter: {}, returnKey: false, showRecordId: false },
               $readPreference: { mode: 'secondary', maxStalenessSeconds: 250 }
             });

test/functional/unified-spec-runner/entities.ts

@@ -45,8 +45,12 @@ function serverApiConfig() {
 }
 
 function getClient(address) {
+  const options: any = { useUnifiedTopology: Boolean(process.env.MONGODB_UNIFIED_TOPOLOGY) };
   const serverApi = serverApiConfig();
-  return new MongoClient(`mongodb://${address}`, serverApi ? { serverApi } : {});
+  if (serverApi) {
+    options.serverApi = serverApi;
+  }
+  return new MongoClient(`mongodb://${address}`, options);
 }
 
 export interface UnifiedMongoClient {

test/functional/versioned-api.test.js

@@ -24,6 +24,7 @@ describe('Versioned API', function() {
           metadata: { sessions: { skipLeakTests: true } },
           test() {
             // FIXME(NODE-3191)
+            // MongoError: BSON field 'FindCommandRequest.returnKey' is not allowed with apiStrict:true.
             if (
               versionedApiTest.description.match(/strict/) &&
               test.description.match(/find and getMore append API version/)

test/functional/view.test.js

@@ -4,9 +4,8 @@ var expect = require('chai').expect,
   co = require('co');
 
 describe('Views', function() {
-  // FIXME(NODE-3191)
   it('should successfully pass through collation to findAndModify command', {
-    metadata: { requires: { generators: true, topology: 'single', apiVersion: false } },
+    metadata: { requires: { generators: true, topology: 'single' } },
 
     test: function(done) {
       var self = this;
@@ -59,6 +58,7 @@ describe('Views', function() {
           ) {
             expect(r).to.exist;
             expect(err).to.not.exist;
+            delete commandResult.apiVersion;
             expect(commandResult).to.eql({
               create: 'test',
               viewOn: 'users',