From c530d5fa348105ead7cab139655b8444dde7424b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 13 Sep 2023 13:17:51 +0200
Subject: [PATCH] Timeout issues

---
 .../src/integration-test/postgres.spec.ts     | 20 ++++++++++---------
 .../src/integrations/tests/utils/index.ts     |  2 ++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 8ce1530ec2..86a43c8c42 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -21,8 +21,6 @@ import { databaseTestProviders } from "../integrations/tests/utils"
 
 const config = setup.getConfig()!
 
-jest.setTimeout(30000)
-
 jest.unmock("pg")
 jest.mock("../websockets")
 
@@ -39,13 +37,13 @@ describe("postgres integrations", () => {
     const apiKey = await config.generateApiKey()
 
     makeRequest = generateMakeRequest(apiKey, true)
-  })
 
-  beforeEach(async () => {
     postgresDatasource = await config.api.datasource.create(
       await databaseTestProviders.postgres.getDsConfig()
     )
+  })
 
+  beforeEach(async () => {
     async function createAuxTable(prefix: string) {
       return await config.createTable({
         name: `${prefix}_${generator.word({ length: 6 })}`,
@@ -345,12 +343,16 @@ describe("postgres integrations", () => {
 
       it("multiple rows can be persisted", async () => {
         const numberOfRows = 10
-        const newRows = Array(numberOfRows).fill(generateRandomPrimaryRowData())
+        const newRows: Row[] = Array(numberOfRows).fill(
+          generateRandomPrimaryRowData()
+        )
 
-        for (const newRow of newRows) {
-          const res = await createRow(primaryPostgresTable._id, newRow)
-          expect(res.status).toBe(200)
-        }
+        await Promise.all(
+          newRows.map(async newRow => {
+            const res = await createRow(primaryPostgresTable._id, newRow)
+            expect(res.status).toBe(200)
+          })
+        )
 
         const persistedRows = await config.getRows(primaryPostgresTable._id!)
         expect(persistedRows).toHaveLength(numberOfRows)
diff --git a/packages/server/src/integrations/tests/utils/index.ts b/packages/server/src/integrations/tests/utils/index.ts
index c145a9c809..a28141db08 100644
--- a/packages/server/src/integrations/tests/utils/index.ts
+++ b/packages/server/src/integrations/tests/utils/index.ts
@@ -3,6 +3,8 @@ jest.unmock("pg")
 import { Datasource } from "@budibase/types"
 import * as pg from "./postgres"
 
+jest.setTimeout(30000)
+
 export interface DatabasePlusTestProvider {
   getDsConfig(): Promise<Datasource>
 }