Skip to content

Commit

Permalink
reverted changes to fix CI, now only contains updated graphql depende…
Browse files Browse the repository at this point in the history
…ncies
  • Loading branch information
FransGH committed Oct 28, 2021
1 parent 90c299f commit d830eac
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ jobs:
- run: npm run coverage
env:
CI: true
- run: bash <(curl -s https://codecov.io/bash)
- run: bash <(curl -s https://codecov.io/bash)
11 changes: 1 addition & 10 deletions package-lock.json

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

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "parse-server",
"version": "4.10.5",
"version": "4.10.4",
"description": "An express module providing a Parse-compatible API server",
"main": "lib/index.js",
"repository": {
Expand Down Expand Up @@ -84,7 +84,6 @@
"form-data": "3.0.0",
"husky": "4.2.5",
"jasmine": "3.5.0",
"jasmine-spec-reporter": "^7.0.0",
"jsdoc": "3.6.7",
"jsdoc-babel": "0.5.0",
"lint-staged": "10.2.3",
Expand Down
6 changes: 2 additions & 4 deletions spec/ParseLiveQuery.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ describe('ParseLiveQuery', function () {
const response = (obj, prev) => {
expect(obj.get('sessionToken')).toBeUndefined();
expect(obj.sessionToken).toBeUndefined();
expect(prev && prev.sessionToken).toBeUndefined();
expect(prev?.sessionToken).toBeUndefined();
if (prev && prev.get) {
expect(prev.get('sessionToken')).toBeUndefined();
}
Expand All @@ -967,10 +967,8 @@ describe('ParseLiveQuery', function () {
await user.save();
user.set('yolo', 'bar');
await user.save();
user.set('foo', 'bar');
await user.save();
await user.destroy();
await new Promise(resolve => setTimeout(resolve, 500));
await new Promise(resolve => process.nextTick(resolve));
for (const key of events) {
expect(calls[key]).toHaveBeenCalled();
}
Expand Down
10 changes: 2 additions & 8 deletions spec/ParseUser.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -3948,7 +3948,7 @@ describe('Parse.User testing', () => {
const response = (obj, prev) => {
expect(obj.get('authData')).toBeUndefined();
expect(obj.authData).toBeUndefined();
expect(prev && prev.authData).toBeUndefined();
expect(prev?.authData).toBeUndefined();
if (prev && prev.get) {
expect(prev.get('authData')).toBeUndefined();
}
Expand All @@ -3967,17 +3967,11 @@ describe('Parse.User testing', () => {
await user.save();
user.set('yolo', 'bar');
await user.save();
user.unset('foo');
await user.save();
await user.destroy();
await new Promise(resolve => setTimeout(resolve, 500));
await new Promise(resolve => process.nextTick(resolve));
for (const key of events) {
expect(calls[key]).toHaveBeenCalled();
}
subscription.unsubscribe();
const client = await Parse.CoreManager.getLiveQueryController().getDefaultLiveQueryClient();
client.close();
await new Promise(resolve => setTimeout(resolve, 500));
});

describe('issue #4897', () => {
Expand Down
12 changes: 0 additions & 12 deletions spec/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@
// Sets up a Parse API server for testing.
jasmine.DEFAULT_TIMEOUT_INTERVAL = process.env.PARSE_SERVER_TEST_TIMEOUT || 5000;

const SpecReporter = require('jasmine-spec-reporter').SpecReporter;

jasmine.getEnv().clearReporters(); // remove default reporter logs
jasmine.getEnv().addReporter(
new SpecReporter({
// add jasmine-spec-reporter
spec: {
displayPending: true,
},
})
);

global.on_db = (db, callback, elseCallback) => {
if (process.env.PARSE_SERVER_TEST_DB == db) {
return callback();
Expand Down

0 comments on commit d830eac

Please sign in to comment.