ensure reconfigureServer when changed

Author: dplewis

package-lock.json

@@ -88,6 +88,7 @@
     "form-data": "3.0.0",
     "husky": "4.2.5",
     "jasmine": "3.5.0",
+    "jasmine-spec-reporter": "6.0.0",
     "jsdoc": "3.6.3",
     "jsdoc-babel": "0.5.0",
     "lint-staged": "10.2.3",

package.json

@@ -40,9 +40,6 @@ const isAccountLockoutError = function (username, password, duration, waitTime)
 };
 
 describe('Account Lockout Policy: ', () => {
-  afterAll(async () => {
-    await reconfigureServer();
-  });
   it('account should not be locked even after failed login attempts if account lockout policy is not set', done => {
     reconfigureServer({
       appName: 'unlimited',

spec/AccountLockoutPolicy.spec.js

@@ -132,12 +132,11 @@ describe('AdapterLoader', () => {
     expect(() => {
       reconfigureServer({
         push: pushAdapterOptions,
-      }).then(async () => {
+      }).then(() => {
         const config = Config.get(Parse.applicationId);
         const pushAdapter = config.pushWorker.adapter;
         expect(pushAdapter.getValidPushTypes()).toEqual(['ios']);
         expect(pushAdapter.options).toEqual(pushAdapterOptions);
-        await reconfigureServer();
         done();
       });
     }).not.toThrow();

spec/AdapterLoader.spec.js

@@ -416,7 +416,6 @@ describe('AudiencesRouter', () => {
     } catch (e) {
       expect(e.data.code).toBe(107);
       expect(e.data.error).toBe('Could not add field lorem');
-      await reconfigureServer();
     }
   });
 });

spec/AudienceRouter.spec.js

@@ -23,19 +23,17 @@ describe('Cloud Code', () => {
     reconfigureServer({
       cloud: __dirname + '/cloud/cloudCodeRelativeFile.js',
     }).then(() => {
-      Parse.Cloud.run('cloudCodeInFile', {}).then(async result => {
+      Parse.Cloud.run('cloudCodeInFile', {}).then(result => {
         expect(result).toEqual('It is possible to define cloud code in a file.');
-        await reconfigureServer();
         done();
       });
     });
   });
 
   it('can load relative cloud code file', done => {
     reconfigureServer({ cloud: './spec/cloud/cloudCodeAbsoluteFile.js' }).then(() => {
-      Parse.Cloud.run('cloudCodeInFile', {}).then(async result => {
+      Parse.Cloud.run('cloudCodeInFile', {}).then(result => {
         expect(result).toEqual('It is possible to define cloud code in a file.');
-        await reconfigureServer();
         done();
       });
     });
@@ -1264,9 +1262,8 @@ describe('Cloud Code', () => {
           },
         })
       )
-      .then(async response => {
+      .then(response => {
         expect(response.data.result).toEqual('second data');
-        await reconfigureServer();
         done();
       })
       .catch(done.fail);
@@ -1821,7 +1818,6 @@ describe('beforeSave hooks', () => {
     const res = await query.find();
     expect(res.length).toEqual(1);
     expect(res[0].get('foo')).toEqual('bar');
-    await reconfigureServer();
   });
 });
 
@@ -2931,10 +2927,6 @@ describe('afterLogin hook', () => {
 });
 
 describe('saveFile hooks', () => {
-  afterAll(async () => {
-    await reconfigureServer();
-  });
-
   it('beforeSaveFile should return file that is already saved and not save anything to files adapter', async () => {
     await reconfigureServer({ filesAdapter: mockAdapter });
     const createFileSpy = spyOn(mockAdapter, 'createFile').and.callThrough();

spec/CloudCode.spec.js

@@ -12,9 +12,6 @@ describe('Enable single schema cache', () => {
     });
   });
 
-  afterAll(async () => {
-    await reconfigureServer();
-  });
   it('can perform multiple create and query operations', done => {
     let config = fakeRequestForConfig();
     let nobody = auth.nobody(config);

spec/EnableSingleSchemaCache.spec.js

@@ -55,7 +55,7 @@ describe('FilesController', () => {
       )
       .then(() => new Promise(resolve => setTimeout(resolve, 200)))
       .then(() => logController.getLogs({ from: Date.now() - 1000, size: 1000 }))
-      .then(async logs => {
+      .then(logs => {
         // we get two logs here: 1. the source of the failure to save the file
         // and 2 the message that will be sent back to the client.
 
@@ -66,7 +66,6 @@ describe('FilesController', () => {
         expect(log2.level).toBe('error');
         expect(log2.code).toBe(130);
 
-        await reconfigureServer();
         done();
       });
   });

spec/FilesController.spec.js

@@ -392,7 +392,6 @@ describe_only_db('mongo')('GridFSBucket and GridStore interop', () => {
     });
     fileData = response.data;
     expect(fileData.metadata).toEqual(metadata);
-    await reconfigureServer();
   });
 
   it('should handle getMetadata error', async () => {

spec/GridFSBucketStorageAdapter.spec.js

@@ -41,10 +41,6 @@ describe_only_db('mongo')('Idempotency', () => {
       ttl: 30,
     });
   });
-
-  afterAll(async () => {
-    await reconfigureServer();
-  });
   // Tests
   it('should enforce idempotency for cloud code function', async () => {
     let counter = 0;

spec/Idempotency.spec.js

@@ -5,10 +5,6 @@ const port = 12345;
 const sslport = 12346;
 
 describe('Ldap Auth', () => {
-  afterAll(async () => {
-    await reconfigureServer();
-  });
-
   it('Should fail with missing options', done => {
     ldap
       .validateAuthData({ id: 'testuser', password: 'testpw' })