Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow single server instance in test suite #7262

Merged
merged 21 commits into from
Mar 13, 2021
Merged

Allow single server instance in test suite #7262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
69226fb
initial pass
dplewis Mar 10, 2021
ebf496c
Merge branch 'master' into clean-tests
dplewis Mar 10, 2021
ed664aa
reconfigureServer when needed
dplewis Mar 11, 2021
119f82b
finish postgres tests
dplewis Mar 11, 2021
571af6b
mongo tests
dplewis Mar 11, 2021
fac4830
more tests
dplewis Mar 11, 2021
2d7f3cd
clean up
dplewis Mar 11, 2021
c883a48
re-add skipped test
dplewis Mar 11, 2021
57a08bb
Fix transaction tests
dplewis Mar 11, 2021
5acec68
handle batch
dplewis Mar 12, 2021
aafbdd7
AuthenticationAdapter fix
dplewis Mar 12, 2021
e8515c7
More reconfiguration
dplewis Mar 12, 2021
c938820
clean up
dplewis Mar 12, 2021
aa7ffb8
properly terminate cli servers
dplewis Mar 12, 2021
6ab6ec9
handle Parse.Push
dplewis Mar 12, 2021
d31f08c
Flaky PushController
dplewis Mar 12, 2021
32f118c
ensure reconfigureServer when changed
dplewis Mar 12, 2021
29439ca
fix postgres tests
dplewis Mar 12, 2021
b307f1f
Merge branch 'master' into clean-tests
dplewis Mar 13, 2021
7f100f3
remove console.log
dplewis Mar 13, 2021
f6db41c
LiveQuery spec remove duplicates and listeners
dplewis Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
"form-data": "3.0.0",
"husky": "4.2.5",
"jasmine": "3.5.0",
"jasmine-spec-reporter": "6.0.0",
"jsdoc": "3.6.3",
"jsdoc-babel": "0.5.0",
"lint-staged": "10.2.3",
Expand Down
6 changes: 5 additions & 1 deletion spec/CLI.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,12 @@ describe('execution', () => {
const binPath = path.resolve(__dirname, '../bin/parse-server');
let childProcess;

afterEach(async () => {
afterEach(done => {
if (childProcess) {
childProcess.on('close', () => {
childProcess = undefined;
done();
});
childProcess.kill();
}
});
Expand Down
6 changes: 4 additions & 2 deletions spec/CloudCode.Validator.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,8 @@ describe('cloud validator', () => {

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

const role2 = new Parse.Role('AdminB', roleACL);
role2.getUsers().add(user);
await Promise.all([role.save({ useMasterKey: true }), role2.save({ useMasterKey: true })]);
await role.save({ useMasterKey: true });
await role2.save({ useMasterKey: true });
await Parse.Cloud.run('cloudFunction');
done();
});
Expand Down
Loading