Small fixes

gristlabs · Nov 5, 2024 · cb593da · cb593da
1 parent 51b9ee6
commit cb593da
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/test/server/lib/DocApi.ts b/test/server/lib/DocApi.ts
@@ -208,7 +208,7 @@ describe('DocApi', function () {
 
         proxy.requireFromOutsideHeader();
 
-        await proxy.start(home, docs);
+        proxy.start(home, docs);
 
         homeUrl = serverUrl = proxy.serverUrl;
         hasHomeApi = true;

diff --git a/test/server/lib/Webhooks-Proxy.ts b/test/server/lib/Webhooks-Proxy.ts
@@ -135,9 +135,8 @@ describe('Webhooks-Proxy', function () {
       describe("should work with a home server and a docworker", async () => {
         setupMockServers('separated', tmpDir, async () => {
           home = await TestServer.startServer('home', tmpDir, suitename, additionaEnvConfiguration);
-          const homeUrl = home.serverUrl;
-          docs = await TestServer.startServer('docs', tmpDir, suitename, additionaEnvConfiguration, homeUrl);
-          serverUrl = homeUrl;
+          docs = await TestServer.startServer('docs', tmpDir, suitename, additionaEnvConfiguration, home.serverUrl);
+          serverUrl = home.serverUrl;
         });
         subTestCall();
       });

diff --git a/test/server/lib/helpers/TestServer.ts b/test/server/lib/helpers/TestServer.ts
@@ -249,9 +249,9 @@ export class TestServerReverseProxy {
     this._requireFromOutsideHeader = true;
   }
 
-  public async start(homeServer: TestServer, docServer: TestServer) {
-    this._app.all(['/dw/dw1', '/dw/dw1/*'], await this._getRequestHandlerFor(docServer));
-    this._app.all('/*', await this._getRequestHandlerFor(homeServer));
+  public start(homeServer: TestServer, docServer: TestServer) {
+    this._app.all(['/dw/dw1', '/dw/dw1/*'], this._getRequestHandlerFor(docServer));
+    this._app.all('/*', this._getRequestHandlerFor(homeServer));
 
     // Forbid now the use of serverUrl property, so we don't allow the tests to
     // call the workers directly
@@ -270,7 +270,7 @@ export class TestServerReverseProxy {
     this._proxy.close();
   }
 
-  private async _getRequestHandlerFor(server: TestServer) {
+  private _getRequestHandlerFor(server: TestServer) {
     const serverUrl = new URL(server.serverUrl);
 
     return (oreq: express.Request, ores: express.Response) => {