refactor shutdown server

Author: dplewis

integration/test/ParseEventuallyQueueTest.js

@@ -193,7 +193,7 @@ describe('Parse EventuallyQueue', () => {
   it('can saveEventually', async () => {
     const parseServer = await reconfigureServer();
     const object = new TestObject({ hash: 'saveSecret' });
-    await parseServer.handleShutdown();
+    await shutdownServer(parseServer);
     await object.saveEventually();
 
     const length = await Parse.EventuallyQueue.length();
@@ -224,7 +224,7 @@ describe('Parse EventuallyQueue', () => {
     const acl = new Parse.ACL(user);
     const object = new TestObject({ hash: 'saveSecret' });
     object.setACL(acl);
-    await parseServer.handleShutdown();
+    await shutdownServer(parseServer);
     await object.saveEventually();
 
     const length = await Parse.EventuallyQueue.length();
@@ -249,7 +249,7 @@ describe('Parse EventuallyQueue', () => {
     const parseServer = await reconfigureServer();
     const object = new TestObject({ hash: 'deleteSecret' });
     await object.save();
-    await parseServer.handleShutdown();
+    await shutdownServer(parseServer);
     await object.destroyEventually();
     const length = await Parse.EventuallyQueue.length();
 

integration/test/ParseServerTest.js

@@ -4,7 +4,7 @@ describe('ParseServer', () => {
   it('can reconfigure server', async () => {
     let parseServer = await reconfigureServer({ serverURL: 'www.google.com' });
     expect(parseServer.config.serverURL).toBe('www.google.com');
-    await parseServer.handleShutdown();
+    await shutdownServer(parseServer);
     parseServer = await reconfigureServer();
     expect(parseServer.config.serverURL).toBe('http://localhost:1337/parse');
   });
@@ -16,7 +16,7 @@ describe('ParseServer', () => {
       close += 1;
     });
     const object = new TestObject({ foo: 'bar' });
-    await parseServer.handleShutdown();
+    await shutdownServer(parseServer);
     expect(close).toBe(1);
     await expectAsync(object.save()).toBeRejectedWithError(
       'XMLHttpRequest failed: "Unable to connect to the Parse API"'

integration/test/helper.js

@@ -96,11 +96,15 @@ const defaultConfiguration = {
 const openConnections = {};
 let parseServer;
 
+const shutdownServer = async _parseServer => {
+  await _parseServer.handleShutdown();
+  // Connection close events are not immediate on node 10+, so wait a bit
+  await sleep(0);
+};
+
 const reconfigureServer = async (changedConfiguration = {}) => {
   if (parseServer) {
-    await parseServer.handleShutdown();
-    // Connection close events are not immediate on node 10+, so wait a bit
-    sleep(0);
+    await shutdownServer(parseServer);
     parseServer = undefined;
     return reconfigureServer(changedConfiguration);
   }
@@ -150,6 +154,7 @@ global.Container = Parse.Object.extend('Container');
 global.TestPoint = Parse.Object.extend('TestPoint');
 global.TestObject = Parse.Object.extend('TestObject');
 global.reconfigureServer = reconfigureServer;
+global.shutdownServer = shutdownServer;
 
 beforeAll(async () => {
   const promise = ['parse.js', 'parse.min.js'].map(fileName => {