Merge branch 'alpha' into dependabot/npm_and_yarn/parse-server-8.2.1

Author: mtrezza

integration/test/IdempotencyTest.js

@@ -35,8 +35,8 @@ describe('Idempotency', () => {
   it('handle duplicate job request', async () => {
     DuplicateRequestId('1234');
     const params = { startedBy: 'Monty Python' };
-    const jobStatusId = await Parse.Cloud.startJob('CloudJob1', params);
-    await expectAsync(Parse.Cloud.startJob('CloudJob1', params)).toBeRejectedWithError(
+    const jobStatusId = await Parse.Cloud.startJob('CloudJobParamsInMessage', params);
+    await expectAsync(Parse.Cloud.startJob('CloudJobParamsInMessage', params)).toBeRejectedWithError(
       'Duplicate request'
     );
 
@@ -49,7 +49,7 @@ describe('Idempotency', () => {
     }
     const jobStatus = await Parse.Cloud.getJobStatus(jobStatusId);
     expect(jobStatus.get('status')).toBe('succeeded');
-    expect(jobStatus.get('params').startedBy).toBe('Monty Python');
+    expect(JSON.parse(jobStatus.get('message'))).toEqual(params);
   });
 
   it('handle duplicate POST / PUT request', async () => {

integration/test/ParseCloudTest.js

@@ -95,13 +95,13 @@ describe('Parse Cloud', () => {
 
   it('run job', async () => {
     const params = { startedBy: 'Monty Python' };
-    const jobStatusId = await Parse.Cloud.startJob('CloudJob1', params);
+    const jobStatusId = await Parse.Cloud.startJob('CloudJobParamsInMessage', params);
     expect(jobStatusId).toBeDefined();
     await waitForJobStatus(jobStatusId, 'succeeded');
 
     const jobStatus = await Parse.Cloud.getJobStatus(jobStatusId);
-    assert.equal(jobStatus.get('status'), 'succeeded');
-    assert.equal(jobStatus.get('params').startedBy, 'Monty Python');
+    expect(jobStatus.get('status')).toBe('succeeded');
+    expect(JSON.parse(jobStatus.get('message'))).toEqual(params);
   });
 
   it('run long job', async () => {
@@ -137,7 +137,7 @@ describe('Parse Cloud', () => {
   it('get jobs data', done => {
     Parse.Cloud.getJobsData().then(result => {
       assert.equal(result.in_use.length, 0);
-      assert.equal(result.jobs.length, 3);
+      assert.equal(result.jobs.length, 4);
       done();
     });
   });

integration/test/cloud/main.js

@@ -45,6 +45,10 @@ Parse.Cloud.job('CloudJob2', function () {
   });
 });
 
+Parse.Cloud.job('CloudJobParamsInMessage', request => {
+  request.message(JSON.stringify(request.params));
+});
+
 Parse.Cloud.job('CloudJobFailing', function () {
   throw 'cloud job failed';
 });

integration/test/helper.js

@@ -74,7 +74,7 @@ const defaultConfiguration = {
     },
   },
   idempotencyOptions: {
-    paths: ['functions/CloudFunctionIdempotency', 'jobs/CloudJob1', 'classes/IdempotentTest'],
+    paths: ['functions/CloudFunctionIdempotency', 'jobs/CloudJob1', 'jobs/CloudJobParamsInMessage', 'classes/IdempotentTest'],
     ttl: 120,
   },
   fileUpload: {

src/ParseObject.ts

@@ -514,6 +514,9 @@ class ParseObject<T extends Attributes = Attributes> {
 
   static _getRequestOptions(options: RequestOptions & FullOptions & { json?: boolean } = {}) {
     const requestOptions: RequestOptions & FullOptions & { json?: boolean } = {};
+    if (Object.prototype.toString.call(options) !== '[object Object]') {
+      throw new Error('request options must be of type Object');
+    }
     const { hasOwn } = Object;
     if (hasOwn(options, 'useMasterKey')) {
       requestOptions.useMasterKey = !!options.useMasterKey;

src/__tests__/Cloud-test.js

@@ -356,4 +356,30 @@ describe('CloudController', () => {
     });
     expect(options.useMasterKey).toBe(false);
   });
+
+  it('run passes with empty options', () => {
+    const values = [undefined, {}];
+
+    const mockRun = jest.fn();
+    mockRun.mockReturnValue(Promise.resolve({ result: {} }));
+
+    CoreManager.setCloudController({
+      run: mockRun,
+      getJobsData: jest.fn(),
+      startJob: jest.fn(),
+    });
+
+    for (const value of values) {
+      mockRun.mockClear();
+      expect(() => Cloud.run('myfunction', {}, value)).not.toThrow();
+      expect(mockRun).toHaveBeenLastCalledWith('myfunction', {}, {});
+    }
+  });
+
+  it('run throws with invalid options', () => {
+    const values = [null, []];
+    for (const value of values) {
+      expect(() => Cloud.run('myfunction', {}, value)).toThrow();
+    }
+  });
 });