Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions src/LiveQueryClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -389,17 +389,22 @@ class LiveQueryClient extends EventEmitter {
break;
default: {
// create, update, enter, leave, delete cases

// Does not override / clear server data
delete data.object.__type;
const parseObject = ParseObject.fromJSON(data.object, false);
if (!subscription) {
break;
}
if (data.original) {
delete data.original.__type;
// Check for removed fields
for (const field in data.original) {
if (!(field in data.object)) {
data.object[field] = undefined;
}
}
data.original = ParseObject.fromJSON(data.original, false);
}
delete data.object.__type;
const parseObject = ParseObject.fromJSON(data.object, false);

subscription.emit(data.op, parseObject, data.original);
}
}
Expand Down
39 changes: 39 additions & 0 deletions src/__tests__/LiveQueryClient-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,45 @@ describe('LiveQueryClient', () => {
expect(isChecked).toBe(true);
});

it('can handle WebSocket response unset field', async () => {
const liveQueryClient = new LiveQueryClient({
applicationId: 'applicationId',
serverURL: 'ws://test',
javascriptKey: 'javascriptKey',
masterKey: 'masterKey',
sessionToken: 'sessionToken'
});
// Add mock subscription
const subscription = new events.EventEmitter();
liveQueryClient.subscriptions.set(1, subscription);

const object = new ParseObject('Test');
const original = new ParseObject('Test');
const pointer = new ParseObject('PointerTest');
pointer.id = '1234';
original.set('pointer', pointer);
const data = {
op: 'update',
clientId: 1,
requestId: 1,
object: object._toFullJSON(),
original: original._toFullJSON(),
};
const event = {
data: JSON.stringify(data)
}
let isChecked = false;
subscription.on('update', (parseObject, parseOriginalObject) => {
isChecked = true;
expect(parseObject.toJSON().pointer).toBeUndefined();
expect(parseOriginalObject.toJSON().pointer.objectId).toEqual(pointer.id);
});

liveQueryClient._handleWebSocketMessage(event);

expect(isChecked).toBe(true);
});

it('can handle WebSocket close message', () => {
const liveQueryClient = new LiveQueryClient({
applicationId: 'applicationId',
Expand Down