Skip to content

Commit 7937412

Browse files
greenkeeper[bot]peril-parse-community[bot]
greenkeeper[bot]
authored and
peril-parse-community[bot]
committed
Update mongodb to the latest version 🚀 (parse-community#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
1 parent 2180177 commit 7937412

7 files changed

+170
-167
lines changed

‎package-lock.json

+4-38
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"lodash": "4.17.15",
4242
"lru-cache": "5.1.1",
4343
"mime": "2.4.4",
44-
"mongodb": "3.2.7",
44+
"mongodb": "3.3.0",
4545
"node-rsa": "1.0.5",
4646
"parse": "2.6.0",
4747
"pg-promise": "9.0.0",

‎spec/MongoStorageAdapter.spec.js

+11-4
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,17 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
280280
};
281281

282282
adapter.createObject('MyClass', schema, {}).then(() => {
283-
expect(adapter.database.serverConfig.isConnected()).toEqual(true);
284-
adapter.handleShutdown();
285-
expect(adapter.database.serverConfig.isConnected()).toEqual(false);
286-
done();
283+
expect(adapter.database.serverConfig.connections().length > 0).toEqual(
284+
true
285+
);
286+
expect(adapter.database.serverConfig.s.connected).toEqual(true);
287+
adapter.handleShutdown().then(() => {
288+
expect(adapter.database.serverConfig.connections().length > 0).toEqual(
289+
false
290+
);
291+
expect(adapter.database.serverConfig.s.connected).toEqual(false);
292+
done();
293+
});
287294
});
288295
});
289296

‎spec/ParseGraphQLServer.spec.js

+37-29
Original file line numberDiff line numberDiff line change
@@ -1999,12 +1999,16 @@ describe('ParseGraphQLServer', () => {
19991999
databaseAdapter.database.serverConfig.cursor.calls
20002000
.all()
20012001
.forEach(call => {
2002-
if (call.args[0].indexOf('GraphQLClass') >= 0) {
2002+
if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
20032003
foundGraphQLClassReadPreference = true;
2004-
expect(call.args[2].readPreference).toBe(null);
2005-
} else if (call.args[0].indexOf('_User') >= 0) {
2004+
expect(call.args[0].options.readPreference.mode).toBe(
2005+
ReadPreference.PRIMARY
2006+
);
2007+
} else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
20062008
foundUserClassReadPreference = true;
2007-
expect(call.args[2].readPreference).toBe(null);
2009+
expect(call.args[0].options.readPreference.mode).toBe(
2010+
ReadPreference.PRIMARY
2011+
);
20082012
}
20092013
});
20102014

@@ -2050,14 +2054,14 @@ describe('ParseGraphQLServer', () => {
20502054
databaseAdapter.database.serverConfig.cursor.calls
20512055
.all()
20522056
.forEach(call => {
2053-
if (call.args[0].indexOf('GraphQLClass') >= 0) {
2057+
if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
20542058
foundGraphQLClassReadPreference = true;
2055-
expect(call.args[2].readPreference.preference).toBe(
2059+
expect(call.args[0].options.readPreference.mode).toBe(
20562060
ReadPreference.SECONDARY
20572061
);
2058-
} else if (call.args[0].indexOf('_User') >= 0) {
2062+
} else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
20592063
foundUserClassReadPreference = true;
2060-
expect(call.args[2].readPreference.preference).toBe(
2064+
expect(call.args[0].options.readPreference.mode).toBe(
20612065
ReadPreference.SECONDARY
20622066
);
20632067
}
@@ -2106,14 +2110,14 @@ describe('ParseGraphQLServer', () => {
21062110
databaseAdapter.database.serverConfig.cursor.calls
21072111
.all()
21082112
.forEach(call => {
2109-
if (call.args[0].indexOf('GraphQLClass') >= 0) {
2113+
if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
21102114
foundGraphQLClassReadPreference = true;
2111-
expect(call.args[2].readPreference.preference).toBe(
2115+
expect(call.args[0].options.readPreference.mode).toBe(
21122116
ReadPreference.SECONDARY
21132117
);
2114-
} else if (call.args[0].indexOf('_User') >= 0) {
2118+
} else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
21152119
foundUserClassReadPreference = true;
2116-
expect(call.args[2].readPreference.preference).toBe(
2120+
expect(call.args[0].options.readPreference.mode).toBe(
21172121
ReadPreference.NEAREST
21182122
);
21192123
}
@@ -2937,12 +2941,16 @@ describe('ParseGraphQLServer', () => {
29372941
databaseAdapter.database.serverConfig.cursor.calls
29382942
.all()
29392943
.forEach(call => {
2940-
if (call.args[0].indexOf('GraphQLClass') >= 0) {
2944+
if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
29412945
foundGraphQLClassReadPreference = true;
2942-
expect(call.args[2].readPreference).toBe(null);
2943-
} else if (call.args[0].indexOf('_User') >= 0) {
2946+
expect(call.args[0].options.readPreference.mode).toBe(
2947+
ReadPreference.PRIMARY
2948+
);
2949+
} else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
29442950
foundUserClassReadPreference = true;
2945-
expect(call.args[2].readPreference).toBe(null);
2951+
expect(call.args[0].options.readPreference.mode).toBe(
2952+
ReadPreference.PRIMARY
2953+
);
29462954
}
29472955
});
29482956

@@ -2986,14 +2994,14 @@ describe('ParseGraphQLServer', () => {
29862994
databaseAdapter.database.serverConfig.cursor.calls
29872995
.all()
29882996
.forEach(call => {
2989-
if (call.args[0].indexOf('GraphQLClass') >= 0) {
2997+
if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
29902998
foundGraphQLClassReadPreference = true;
2991-
expect(call.args[2].readPreference.preference).toBe(
2999+
expect(call.args[0].options.readPreference.mode).toBe(
29923000
ReadPreference.SECONDARY
29933001
);
2994-
} else if (call.args[0].indexOf('_User') >= 0) {
3002+
} else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
29953003
foundUserClassReadPreference = true;
2996-
expect(call.args[2].readPreference.preference).toBe(
3004+
expect(call.args[0].options.readPreference.mode).toBe(
29973005
ReadPreference.SECONDARY
29983006
);
29993007
}
@@ -3040,14 +3048,14 @@ describe('ParseGraphQLServer', () => {
30403048
databaseAdapter.database.serverConfig.cursor.calls
30413049
.all()
30423050
.forEach(call => {
3043-
if (call.args[0].indexOf('GraphQLClass') >= 0) {
3051+
if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
30443052
foundGraphQLClassReadPreference = true;
3045-
expect(call.args[2].readPreference.preference).toBe(
3053+
expect(call.args[0].options.readPreference.mode).toBe(
30463054
ReadPreference.SECONDARY
30473055
);
3048-
} else if (call.args[0].indexOf('_User') >= 0) {
3056+
} else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
30493057
foundUserClassReadPreference = true;
3050-
expect(call.args[2].readPreference.preference).toBe(
3058+
expect(call.args[0].options.readPreference.mode).toBe(
30513059
ReadPreference.NEAREST
30523060
);
30533061
}
@@ -3077,7 +3085,7 @@ describe('ParseGraphQLServer', () => {
30773085
readPreference: SECONDARY
30783086
subqueryReadPreference: NEAREST
30793087
) {
3080-
count
3088+
results
30813089
}
30823090
}
30833091
}
@@ -3101,14 +3109,14 @@ describe('ParseGraphQLServer', () => {
31013109
databaseAdapter.database.serverConfig.cursor.calls
31023110
.all()
31033111
.forEach(call => {
3104-
if (call.args[0].indexOf('GraphQLClass') >= 0) {
3112+
if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
31053113
foundGraphQLClassReadPreference = true;
3106-
expect(call.args[2].readPreference.preference).toBe(
3114+
expect(call.args[0].options.readPreference.mode).toBe(
31073115
ReadPreference.SECONDARY
31083116
);
3109-
} else if (call.args[0].indexOf('_User') >= 0) {
3117+
} else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
31103118
foundUserClassReadPreference = true;
3111-
expect(call.args[2].readPreference.preference).toBe(
3119+
expect(call.args[0].options.readPreference.mode).toBe(
31123120
ReadPreference.NEAREST
31133121
);
31143122
}

0 commit comments

Comments
 (0)