Update mongodb to the latest version 🚀 (#5914)

* fix(package): update mongodb to version 3.3.0

* chore(package): update lockfile package-lock.json

* Fix tests

* Fix GraphQL tests for read preference

* Fix mongo adapter deprecation notice

* Fix the way the connections are checked, return promise when shutting down mongo

spec/MongoStorageAdapter.spec.js

@@ -280,10 +280,17 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
     };
 
     adapter.createObject('MyClass', schema, {}).then(() => {
-      expect(adapter.database.serverConfig.isConnected()).toEqual(true);
-      adapter.handleShutdown();
-      expect(adapter.database.serverConfig.isConnected()).toEqual(false);
-      done();
+      expect(adapter.database.serverConfig.connections().length > 0).toEqual(
+        true
+      );
+      expect(adapter.database.serverConfig.s.connected).toEqual(true);
+      adapter.handleShutdown().then(() => {
+        expect(adapter.database.serverConfig.connections().length > 0).toEqual(
+          false
+        );
+        expect(adapter.database.serverConfig.s.connected).toEqual(false);
+        done();
+      });
     });
   });
 

spec/ParseGraphQLServer.spec.js

@@ -1999,12 +1999,16 @@ describe('ParseGraphQLServer', () => {
               databaseAdapter.database.serverConfig.cursor.calls
                 .all()
                 .forEach(call => {
-                  if (call.args[0].indexOf('GraphQLClass') >= 0) {
+                  if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
                     foundGraphQLClassReadPreference = true;
-                    expect(call.args[2].readPreference).toBe(null);
-                  } else if (call.args[0].indexOf('_User') >= 0) {
+                    expect(call.args[0].options.readPreference.mode).toBe(
+                      ReadPreference.PRIMARY
+                    );
+                  } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
                     foundUserClassReadPreference = true;
-                    expect(call.args[2].readPreference).toBe(null);
+                    expect(call.args[0].options.readPreference.mode).toBe(
+                      ReadPreference.PRIMARY
+                    );
                   }
                 });
 
@@ -2050,14 +2054,14 @@ describe('ParseGraphQLServer', () => {
               databaseAdapter.database.serverConfig.cursor.calls
                 .all()
                 .forEach(call => {
-                  if (call.args[0].indexOf('GraphQLClass') >= 0) {
+                  if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
                     foundGraphQLClassReadPreference = true;
-                    expect(call.args[2].readPreference.preference).toBe(
+                    expect(call.args[0].options.readPreference.mode).toBe(
                       ReadPreference.SECONDARY
                     );
-                  } else if (call.args[0].indexOf('_User') >= 0) {
+                  } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
                     foundUserClassReadPreference = true;
-                    expect(call.args[2].readPreference.preference).toBe(
+                    expect(call.args[0].options.readPreference.mode).toBe(
                       ReadPreference.SECONDARY
                     );
                   }
@@ -2106,14 +2110,14 @@ describe('ParseGraphQLServer', () => {
               databaseAdapter.database.serverConfig.cursor.calls
                 .all()
                 .forEach(call => {
-                  if (call.args[0].indexOf('GraphQLClass') >= 0) {
+                  if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
                     foundGraphQLClassReadPreference = true;
-                    expect(call.args[2].readPreference.preference).toBe(
+                    expect(call.args[0].options.readPreference.mode).toBe(
                       ReadPreference.SECONDARY
                     );
-                  } else if (call.args[0].indexOf('_User') >= 0) {
+                  } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
                     foundUserClassReadPreference = true;
-                    expect(call.args[2].readPreference.preference).toBe(
+                    expect(call.args[0].options.readPreference.mode).toBe(
                       ReadPreference.NEAREST
                     );
                   }
@@ -2937,12 +2941,16 @@ describe('ParseGraphQLServer', () => {
               databaseAdapter.database.serverConfig.cursor.calls
                 .all()
                 .forEach(call => {
-                  if (call.args[0].indexOf('GraphQLClass') >= 0) {
+                  if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
                     foundGraphQLClassReadPreference = true;
-                    expect(call.args[2].readPreference).toBe(null);
-                  } else if (call.args[0].indexOf('_User') >= 0) {
+                    expect(call.args[0].options.readPreference.mode).toBe(
+                      ReadPreference.PRIMARY
+                    );
+                  } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
                     foundUserClassReadPreference = true;
-                    expect(call.args[2].readPreference).toBe(null);
+                    expect(call.args[0].options.readPreference.mode).toBe(
+                      ReadPreference.PRIMARY
+                    );
                   }
                 });
 
@@ -2986,14 +2994,14 @@ describe('ParseGraphQLServer', () => {
               databaseAdapter.database.serverConfig.cursor.calls
                 .all()
                 .forEach(call => {
-                  if (call.args[0].indexOf('GraphQLClass') >= 0) {
+                  if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
                     foundGraphQLClassReadPreference = true;
-                    expect(call.args[2].readPreference.preference).toBe(
+                    expect(call.args[0].options.readPreference.mode).toBe(
                       ReadPreference.SECONDARY
                     );
-                  } else if (call.args[0].indexOf('_User') >= 0) {
+                  } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
                     foundUserClassReadPreference = true;
-                    expect(call.args[2].readPreference.preference).toBe(
+                    expect(call.args[0].options.readPreference.mode).toBe(
                       ReadPreference.SECONDARY
                     );
                   }
@@ -3040,14 +3048,14 @@ describe('ParseGraphQLServer', () => {
               databaseAdapter.database.serverConfig.cursor.calls
                 .all()
                 .forEach(call => {
-                  if (call.args[0].indexOf('GraphQLClass') >= 0) {
+                  if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
                     foundGraphQLClassReadPreference = true;
-                    expect(call.args[2].readPreference.preference).toBe(
+                    expect(call.args[0].options.readPreference.mode).toBe(
                       ReadPreference.SECONDARY
                     );
-                  } else if (call.args[0].indexOf('_User') >= 0) {
+                  } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
                     foundUserClassReadPreference = true;
-                    expect(call.args[2].readPreference.preference).toBe(
+                    expect(call.args[0].options.readPreference.mode).toBe(
                       ReadPreference.NEAREST
                     );
                   }
@@ -3077,7 +3085,7 @@ describe('ParseGraphQLServer', () => {
                         readPreference: SECONDARY
                         subqueryReadPreference: NEAREST
                       ) {
-                        count
+                        results
                       }
                     }
                   }
@@ -3101,14 +3109,14 @@ describe('ParseGraphQLServer', () => {
               databaseAdapter.database.serverConfig.cursor.calls
                 .all()
                 .forEach(call => {
-                  if (call.args[0].indexOf('GraphQLClass') >= 0) {
+                  if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
                     foundGraphQLClassReadPreference = true;
-                    expect(call.args[2].readPreference.preference).toBe(
+                    expect(call.args[0].options.readPreference.mode).toBe(
                       ReadPreference.SECONDARY
                     );
-                  } else if (call.args[0].indexOf('_User') >= 0) {
+                  } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
                     foundUserClassReadPreference = true;
-                    expect(call.args[2].readPreference.preference).toBe(
+                    expect(call.args[0].options.readPreference.mode).toBe(
                       ReadPreference.NEAREST
                     );
                   }

spec/ReadPreferenceOption.spec.js

@@ -27,14 +27,15 @@ describe_only_db('mongo')('Read preference option', () => {
         return query.find().then(results => {
           expect(results.length).toBe(1);
           expect(results[0].get('boolKey')).toBe(false);
-
           let myObjectReadPreference = null;
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
                 myObjectReadPreference = true;
-                expect(call.args[2].readPreference).toBe(null);
+                expect(call.args[0].options.readPreference.mode).toBe(
+                  ReadPreference.PRIMARY
+                );
               }
             });
 
@@ -79,9 +80,9 @@ describe_only_db('mongo')('Read preference option', () => {
 
     let myObjectReadPreference = null;
     databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].indexOf('MyObject') >= 0) {
+      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
         myObjectReadPreference = true;
-        expect(call.args[2].readPreference.preference).toBe(
+        expect(call.args[0].options.readPreference.mode).toBe(
           ReadPreference.NEAREST
         );
       }
@@ -118,8 +119,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -159,8 +161,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -201,8 +204,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -246,8 +250,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -291,8 +296,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -332,8 +338,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -375,8 +382,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -418,8 +426,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -457,8 +466,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -502,8 +512,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -545,8 +556,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -592,8 +604,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -638,8 +651,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -679,8 +693,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -724,8 +739,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -739,7 +755,7 @@ describe_only_db('mongo')('Read preference option', () => {
     });
   });
 
-  it('should change read preference for count', done => {
+  xit('should change read preference for count', done => {
     const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
 
     const obj0 = new Parse.Object('MyObject');
@@ -766,8 +782,9 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject') >= 0) {
-                myObjectReadPreference = call.args[2].readPreference.preference;
+              if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+                myObjectReadPreference =
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -823,17 +840,17 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject0') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
                 myObjectReadPreference0 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject1') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
                 myObjectReadPreference1 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject2') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
                 myObjectReadPreference2 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -892,17 +909,17 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject0') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
                 myObjectReadPreference0 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject1') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
                 myObjectReadPreference1 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject2') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
                 myObjectReadPreference2 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -959,17 +976,17 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject0') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
                 myObjectReadPreference0 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject1') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
                 myObjectReadPreference1 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject2') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
                 myObjectReadPreference2 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -1027,17 +1044,17 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject0') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
                 myObjectReadPreference0 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject1') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
                 myObjectReadPreference1 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject2') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
                 myObjectReadPreference2 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -1093,17 +1110,17 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject0') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
                 myObjectReadPreference0 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject1') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
                 myObjectReadPreference1 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject2') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
                 myObjectReadPreference2 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -1158,17 +1175,17 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject0') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
                 myObjectReadPreference0 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject1') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
                 myObjectReadPreference1 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject2') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
                 myObjectReadPreference2 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -1225,17 +1242,17 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject0') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
                 myObjectReadPreference0 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject1') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
                 myObjectReadPreference1 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject2') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
                 myObjectReadPreference2 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -1293,17 +1310,17 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject0') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
                 myObjectReadPreference0 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject1') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
                 myObjectReadPreference1 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject2') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
                 myObjectReadPreference2 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
             });
 
@@ -1375,17 +1392,17 @@ describe_only_db('mongo')('Read preference option', () => {
           databaseAdapter.database.serverConfig.cursor.calls
             .all()
             .forEach(call => {
-              if (call.args[0].indexOf('MyObject0') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
                 myObjectReadPreference0 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject1') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
                 myObjectReadPreference1 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
-              if (call.args[0].indexOf('MyObject2') >= 0) {
+              if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
                 myObjectReadPreference2 =
-                  call.args[2].readPreference.preference;
+                  call.args[0].options.readPreference.mode;
               }
             });