Merge branch 'alpha' into increase-coverage

Author: mtrezza

.github/workflows/release-automated.yml

@@ -30,7 +30,7 @@ jobs:
       - run: npx semantic-release
         env:
           GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Determine tag on current commit
         id: tag

changelogs/CHANGELOG_beta.md

@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "5.0.0-alpha.29",
+  "version": "5.1.1",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {
@@ -69,6 +69,7 @@
     "@babel/plugin-transform-flow-strip-types": "7.9.0",
     "@babel/preset-env": "7.10.0",
     "@parse/minami": "1.0.0",
+    "@saithodev/semantic-release-backmerge": "2.1.2",
     "@semantic-release/changelog": "5.0.1",
     "@semantic-release/commit-analyzer": "8.0.1",
     "@semantic-release/git": "9.0.0",

changelogs/CHANGELOG_release.md

@@ -83,6 +83,16 @@ async function config() {
       ['@semantic-release/git', {
         assets: [changelogFile, 'package.json', 'package-lock.json', 'npm-shrinkwrap.json'],
       }],
+      [
+        "@saithodev/semantic-release-backmerge",
+        {
+          "branches": [
+            { from: "beta", to: "alpha" },
+            { from: "release", to: "beta" },
+            { from: "release", to: "alpha" },
+          ]
+        }
+      ],
       ['@semantic-release/github', {
         successComment: getReleaseComment(),
         labels: ['type:ci'],

package-lock.json

@@ -1722,7 +1722,9 @@ describe('Apple Game Center Auth adapter', () => {
       await gcenter.validateAuthData(authData);
       fail();
     } catch (e) {
-      expect(e.message).toBe('Apple Game Center - invalid publicKeyUrl: http://static.gc.apple.com/public-key/gc-prod-4.cer');
+      expect(e.message).toBe(
+        'Apple Game Center - invalid publicKeyUrl: http://static.gc.apple.com/public-key/gc-prod-4.cer'
+      );
     }
   });
 });

package.json

@@ -93,28 +93,31 @@ describe('Idempotency', () => {
     expect(counter).toBe(2);
   });
 
-  it_only_db('postgres')('should delete request entry when postgress ttl function is called', async () => {
-    const client = Config.get(Parse.applicationId).database.adapter._client;
-    let counter = 0;
-    Parse.Cloud.define('myFunction', () => {
-      counter++;
-    });
-    const params = {
-      method: 'POST',
-      url: 'http://localhost:8378/1/functions/myFunction',
-      headers: {
-        'X-Parse-Application-Id': Parse.applicationId,
-        'X-Parse-Master-Key': Parse.masterKey,
-        'X-Parse-Request-Id': 'abc-123',
-      },
-    };
-    await expectAsync(request(params)).toBeResolved();
-    await expectAsync(request(params)).toBeRejected();
-    await new Promise(resolve => setTimeout(resolve, maxTimeOut));
-    await client.one('SELECT idempotency_delete_expired_records()');
-    await expectAsync(request(params)).toBeResolved();
-    expect(counter).toBe(2);
-  });
+  it_only_db('postgres')(
+    'should delete request entry when postgress ttl function is called',
+    async () => {
+      const client = Config.get(Parse.applicationId).database.adapter._client;
+      let counter = 0;
+      Parse.Cloud.define('myFunction', () => {
+        counter++;
+      });
+      const params = {
+        method: 'POST',
+        url: 'http://localhost:8378/1/functions/myFunction',
+        headers: {
+          'X-Parse-Application-Id': Parse.applicationId,
+          'X-Parse-Master-Key': Parse.masterKey,
+          'X-Parse-Request-Id': 'abc-123',
+        },
+      };
+      await expectAsync(request(params)).toBeResolved();
+      await expectAsync(request(params)).toBeRejected();
+      await new Promise(resolve => setTimeout(resolve, maxTimeOut));
+      await client.one('SELECT idempotency_delete_expired_records()');
+      await expectAsync(request(params)).toBeResolved();
+      expect(counter).toBe(2);
+    }
+  );
 
   it('should enforce idempotency for cloud code jobs', async () => {
     let counter = 0;

release.config.js

@@ -4777,7 +4777,7 @@ describe('Parse.Query testing', () => {
       ttl: new Date(now - 2 * 24 * 60 * 60 * 1000), // 2 days ago
     });
 
-    await Parse.Object.saveAll([obj1, obj2])
+    await Parse.Object.saveAll([obj1, obj2]);
     const q1 = new Parse.Query('MyCustomObject');
     q1.greaterThan('ttl', { $relativeTime: 'in 1 day' });
     const results1 = await q1.find({ useMasterKey: true });
@@ -4825,8 +4825,8 @@ describe('Parse.Query testing', () => {
     q.greaterThan('ttl', { $relativeTime: '-12 bananas ago' });
     try {
       await q.find({ useMasterKey: true });
-      fail("Should have thrown error");
-    } catch(error) {
+      fail('Should have thrown error');
+    } catch (error) {
       expect(error.code).toBe(Parse.Error.INVALID_JSON);
     }
   });
@@ -4842,8 +4842,8 @@ describe('Parse.Query testing', () => {
     q.greaterThan('nonDateField', { $relativeTime: '1 day ago' });
     try {
       await q.find({ useMasterKey: true });
-      fail("Should have thrown error");
-    } catch(error) {
+      fail('Should have thrown error');
+    } catch (error) {
       expect(error.code).toBe(Parse.Error.INVALID_JSON);
     }
   });

spec/AuthenticationAdapters.spec.js

@@ -186,10 +186,7 @@ describe('ParseServerRESTController', () => {
             databaseAdapter.createObject.calls.argsFor(i + 1)[3]
           );
         }
-        expect(results.map(result => result.get('key')).sort()).toEqual([
-          'value1',
-          'value2',
-        ]);
+        expect(results.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
       });
 
       it('should not save anything when one operation fails in a transaction', async () => {