From 5e2e43a7d7e342014d97010ee723d6b23848f6f7 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 8 Sep 2023 13:52:17 +0200
Subject: [PATCH] Clean configs

---
 .../server/src/api/routes/tests/row.spec.ts   | 70 ++++++++++---------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 0fab8eb426..d572097469 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -49,37 +49,39 @@ describe.each([
     await config.init()
   })
 
-  beforeEach(async () => {
-    mocks.licenses.useCloudFree()
-    let tableConfig: SaveTableRequest = {
-      name: generator.guid(),
-      type: "table",
-      primary: ["id"],
-      schema: {
-        id: {
-          type: FieldType.AUTO,
-          name: "id",
-          autocolumn: true,
-          constraints: {
-            presence: true,
-          },
-        },
-        name: {
-          type: FieldType.STRING,
-          name: "name",
-          constraints: {
-            type: "string",
-          },
-        },
-        description: {
-          type: FieldType.STRING,
-          name: "description",
-          constraints: {
-            type: "string",
-          },
+  const generateTableConfig: () => SaveTableRequest = () => ({
+    name: generator.guid(),
+    type: "table",
+    primary: ["id"],
+    schema: {
+      id: {
+        type: FieldType.AUTO,
+        name: "id",
+        autocolumn: true,
+        constraints: {
+          presence: true,
         },
       },
-    }
+      name: {
+        type: FieldType.STRING,
+        name: "name",
+        constraints: {
+          type: "string",
+        },
+      },
+      description: {
+        type: FieldType.STRING,
+        name: "description",
+        constraints: {
+          type: "string",
+        },
+      },
+    },
+  })
+
+  beforeEach(async () => {
+    mocks.licenses.useCloudFree()
+    const tableConfig = generateTableConfig()
 
     if (dsProvider) {
       datasource = await config.api.datasource.create(
@@ -93,6 +95,8 @@ describe.each([
     }
 
     table = await config.api.table.create(tableConfig)
+    config.table = table
+    config.datasource = datasource
     row = basicRow(table._id!)
   })
 
@@ -130,8 +134,8 @@ describe.each([
     expect(usage).toBe(expected)
   }
 
-  const createRow = (row?: SaveRowRequest) =>
-    config.api.row.save(table._id!, row || basicRow(table._id!))
+  const createRow = (tableId = table._id!, row?: SaveRowRequest) =>
+    config.api.row.save(tableId, row || basicRow(table._id!))
 
   describe("save, load, update", () => {
     function getDefaultFields() {
@@ -270,7 +274,7 @@ describe.each([
         status: "new",
       }
       await createRow()
-      await createRow(newRow)
+      await createRow(table._id, newRow)
       const queryUsage = await getQueryUsage()
 
       const res = await request
@@ -552,7 +556,7 @@ describe.each([
 
   describe("destroy", () => {
     it("should be able to delete a row", async () => {
-      const createdRow = await createRow(row)
+      const createdRow = await createRow()
       const rowUsage = await getRowUsage()
       const queryUsage = await getQueryUsage()