Update helper.js

dblythy · dblythy · commit 87ccf2759631 · 2022-12-23T14:05:48.000+11:00
diff --git a/integration/test/helper.js b/integration/test/helper.js
@@ -97,38 +97,28 @@ const destroyAliveConnections = function () {
 let parseServer;
 let server;
 
-const reconfigureServer = (changedConfiguration = {}) => {
-  return new Promise((resolve, reject) => {
-    if (server) {
-      return parseServer.handleShutdown().then(() => {
-        server.close(() => {
-          parseServer = undefined;
-          server = undefined;
-          reconfigureServer(changedConfiguration).then(resolve, reject);
-        });
+const reconfigureServer = async (changedConfiguration = {}) => {
+  if (server) {
+    return parseServer.handleShutdown().then(() => {
+      server.close(() => {
+        parseServer = undefined;
+        server = undefined;
+        return reconfigureServer(changedConfiguration);
       });
-    }
-    try {
-      didChangeConfiguration = Object.keys(changedConfiguration).length !== 0;
-      const newConfiguration = Object.assign({}, defaultConfiguration, changedConfiguration || {}, {
-        serverStartComplete: error => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve(parseServer);
-          }
-        },
-        mountPath,
-        port,
-      });
-      parseServer = ParseServer.start(newConfiguration);
-      const app = parseServer.expressApp;
-      for (const fileName of ['parse.js', 'parse.min.js']) {
-        const file = fs
-          .readFileSync(path.resolve(__dirname, `./../../dist/${fileName}`))
-          .toString();
-        app.get(`/${fileName}`, (req, res) => {
-          res.send(`<html><head>
+    });
+  }
+
+  didChangeConfiguration = Object.keys(changedConfiguration).length !== 0;
+  const newConfiguration = Object.assign({}, defaultConfiguration, changedConfiguration || {}, {
+    mountPath,
+    port,
+  });
+  parseServer = await ParseServer.startApp(newConfiguration);
+  const app = parseServer.expressApp;
+  for (const fileName of ['parse.js', 'parse.min.js']) {
+    const file = fs.readFileSync(path.resolve(__dirname, `./../../dist/${fileName}`)).toString();
+    app.get(`/${fileName}`, (req, res) => {
+      res.send(`<html><head>
           <meta charset="utf-8">
           <meta http-equiv="X-UA-Compatible" content="IE=edge">
           <title>Parse Functionality Test</title>
@@ -142,25 +132,21 @@ const reconfigureServer = (changedConfiguration = {}) => {
           </head>
         <body>
         </body></html>`);
-        });
-      }
-      app.get('/clear/:fast', (req, res) => {
-        const { fast } = req.params;
-        TestUtils.destroyAllDataPermanently(fast).then(() => {
-          res.send('{}');
-        });
-      });
-      server = parseServer.server;
-      server.on('connection', connection => {
-        const key = `${connection.remoteAddress}:${connection.remotePort}`;
-        openConnections[key] = connection;
-        connection.on('close', () => {
-          delete openConnections[key];
-        });
-      });
-    } catch (error) {
-      reject(error);
-    }
+    });
+  }
+  app.get('/clear/:fast', (req, res) => {
+    const { fast } = req.params;
+    TestUtils.destroyAllDataPermanently(fast).then(() => {
+      res.send('{}');
+    });
+  });
+  server = parseServer.server;
+  server.on('connection', connection => {
+    const key = `${connection.remoteAddress}:${connection.remotePort}`;
+    openConnections[key] = connection;
+    connection.on('close', () => {
+      delete openConnections[key];
+    });
   });
 };
 global.DiffObject = Parse.Object.extend('DiffObject');
