Add E2E tests

Author: dplewis

package.json

@@ -104,6 +104,7 @@
     "posttest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.0.4} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=mmapv1} mongodb-runner stop",
     "coverage": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.0.4} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=mmapv1} TESTING=1 nyc jasmine",
     "start": "node ./bin/parse-server",
+    "prettier": "prettier --write {src,spec}/**/*.js",
     "prepare": "npm run build",
     "postinstall": "node -p 'require(\"./postinstall.js\")()'"
   },

spec/ParseLiveQuery.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-describe('ParseLiveQuery', function() {
+describe('ParseLiveQuery', function () {
   it('can subscribe to query', async done => {
     await reconfigureServer({
       liveQuery: {
@@ -24,6 +24,97 @@ describe('ParseLiveQuery', function() {
     await object.save();
   });
 
+  it('can handle beforeConnect / beforeSubscribe hooks', async done => {
+    await reconfigureServer({
+      liveQuery: {
+        classNames: ['TestObject'],
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+    const object = new TestObject();
+    await object.save();
+
+    Parse.Cloud.beforeSubscribe('TestObject', req => {
+      expect(req.op).toBe('subscribe');
+      expect(req.requestId).toBe(1);
+      expect(req.query).toBeDefined();
+      expect(req.user).toBeUndefined();
+    });
+
+    Parse.Cloud.beforeConnect(req => {
+      expect(req.event).toBe('connect');
+      expect(req.clients).toBe(0);
+      expect(req.subscriptions).toBe(0);
+      expect(req.useMasterKey).toBe(false);
+      expect(req.installationId).toBeDefined();
+      expect(req.user).toBeUndefined();
+      expect(req.sessionToken).toBeUndefined();
+      expect(req.client).toBeDefined();
+    });
+    const query = new Parse.Query(TestObject);
+    query.equalTo('objectId', object.id);
+    const subscription = await query.subscribe();
+    subscription.on('update', async object => {
+      expect(object.get('foo')).toBe('bar');
+      done();
+    });
+    object.set({ foo: 'bar' });
+    await object.save();
+  });
+
+  it('can handle beforeConnect error', async done => {
+    await reconfigureServer({
+      liveQuery: {
+        classNames: ['TestObject'],
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+    const object = new TestObject();
+    await object.save();
+
+    Parse.Cloud.beforeConnect(() => {
+      throw new Error('You shall not pass!');
+    });
+    Parse.LiveQuery.on('error', error => {
+      expect(error).toBe('You shall not pass!');
+      done();
+    });
+    const query = new Parse.Query(TestObject);
+    query.equalTo('objectId', object.id);
+    await query.subscribe();
+  });
+
+  it('can handle beforeSubscribe error', async done => {
+    await reconfigureServer({
+      liveQuery: {
+        classNames: ['TestObject'],
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+    const object = new TestObject();
+    await object.save();
+
+    Parse.Cloud.beforeSubscribe(TestObject, () => {
+      throw new Error('You shall not subscribe!');
+    });
+    Parse.LiveQuery.on('error', error => {
+      expect(error).toBe('You shall not subscribe!');
+    });
+    const query = new Parse.Query(TestObject);
+    query.equalTo('objectId', object.id);
+    const subscription = await query.subscribe();
+    subscription.on('error', error => {
+      expect(error).toBe('You shall not subscribe!');
+      done();
+    });
+  });
+
   it('handle invalid websocket payload length', async done => {
     await reconfigureServer({
       liveQuery: {
@@ -61,7 +152,7 @@ describe('ParseLiveQuery', function() {
     }, 1000);
   });
 
-  afterEach(async function(done) {
+  afterEach(async function (done) {
     const client = await Parse.CoreManager.getLiveQueryController().getDefaultLiveQueryClient();
     client.close();
     // Wait for live query client to disconnect

src/LiveQuery/Client.js

@@ -62,15 +62,17 @@ class Client {
     parseWebSocket: any,
     code: number,
     error: string,
-    reconnect: boolean = true
+    reconnect: boolean = true,
+    requestId: number | void = null
   ): void {
     Client.pushResponse(
       parseWebSocket,
       JSON.stringify({
         op: 'error',
-        error: error,
-        code: code,
-        reconnect: reconnect,
+        error,
+        code,
+        reconnect,
+        requestId,
       })
     );
   }

src/LiveQuery/ParseLiveQueryServer.js

@@ -728,7 +728,13 @@ class ParseLiveQueryServer {
         installationId: client.installationId,
       });
     } catch (e) {
-      Client.pushError(parseWebsocket, e.code || 101, e.message || e, false);
+      Client.pushError(
+        parseWebsocket,
+        e.code || 101,
+        e.message || e,
+        false,
+        request.requestId
+      );
       logger.error(
         `Failed running beforeSubscribe on ${className} for session ${request.sessionToken} with:\n Error: ` +
           JSON.stringify(e)