Skip to content

Commit 9563793

Browse files
authored
Allow single server instance in test suite (#7262)
* initial pass * reconfigureServer when needed * finish postgres tests * mongo tests * more tests * clean up * re-add skipped test * Fix transaction tests * handle batch * AuthenticationAdapter fix * More reconfiguration * clean up * properly terminate cli servers * handle Parse.Push * Flaky PushController * ensure reconfigureServer when changed * fix postgres tests * remove console.log * LiveQuery spec remove duplicates and listeners
1 parent 8b0e8cd commit 9563793

36 files changed

+940
-1019
lines changed

Diff for: package-lock.json

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

Diff for: package.json

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
"form-data": "3.0.0",
8989
"husky": "4.2.5",
9090
"jasmine": "3.5.0",
91+
"jasmine-spec-reporter": "6.0.0",
9192
"jsdoc": "3.6.3",
9293
"jsdoc-babel": "0.5.0",
9394
"lint-staged": "10.2.3",

Diff for: spec/CLI.spec.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,12 @@ describe('execution', () => {
209209
const binPath = path.resolve(__dirname, '../bin/parse-server');
210210
let childProcess;
211211

212-
afterEach(async () => {
212+
afterEach(done => {
213213
if (childProcess) {
214+
childProcess.on('close', () => {
215+
childProcess = undefined;
216+
done();
217+
});
214218
childProcess.kill();
215219
}
216220
});

Diff for: spec/CloudCode.Validator.spec.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,8 @@ describe('cloud validator', () => {
920920

921921
const role2 = new Parse.Role('Admin2', roleACL);
922922
role2.getUsers().add(user);
923-
await Promise.all([role.save({ useMasterKey: true }), role2.save({ useMasterKey: true })]);
923+
await role.save({ useMasterKey: true });
924+
await role2.save({ useMasterKey: true });
924925
await Parse.Cloud.run('cloudFunction');
925926
done();
926927
});
@@ -981,7 +982,8 @@ describe('cloud validator', () => {
981982

982983
const role2 = new Parse.Role('AdminB', roleACL);
983984
role2.getUsers().add(user);
984-
await Promise.all([role.save({ useMasterKey: true }), role2.save({ useMasterKey: true })]);
985+
await role.save({ useMasterKey: true });
986+
await role2.save({ useMasterKey: true });
985987
await Parse.Cloud.run('cloudFunction');
986988
done();
987989
});

0 commit comments

Comments
 (0)