From 2feb22ef643abf466f1ed99784ff5225ee94af2f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 19 Jul 2023 12:38:01 +0200
Subject: [PATCH] Use api for viewv2 tests

---
 .../src/api/routes/tests/viewV2.spec.ts       | 55 ++++++-------------
 .../server/src/tests/utilities/api/viewV2.ts  | 36 +++++++++++-
 2 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index bc5c13297a..e395e59044 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -24,7 +24,6 @@ function priceTable(): Table {
 }
 
 describe("/v2/views", () => {
-  const request = setup.getRequest()
   const config = setup.getConfig()
 
   afterAll(setup.afterAll)
@@ -45,11 +44,7 @@ describe("/v2/views", () => {
     })
 
     it("returns all views", async () => {
-      const res = await request
-        .get(`/api/v2/views`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
+      const res = await config.api.viewV2.fetch()
 
       expect(res.body.views.length).toBe(10)
       expect(res.body.views).toEqual(
@@ -64,11 +59,7 @@ describe("/v2/views", () => {
         newViews.push(await config.api.viewV2.create({ tableId: newTable._id }))
       }
 
-      const res = await request
-        .get(`/api/v2/views?tableId=${newTable._id}`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
+      const res = await config.api.viewV2.fetch(newTable._id)
 
       expect(res.body.views.length).toBe(5)
       expect(res.body.views).toEqual(
@@ -77,7 +68,8 @@ describe("/v2/views", () => {
     })
 
     it("can not filter by multiple table ids", async () => {
-      const res = await request
+      const res = await config
+        .getRequest()!
         .get(
           `/api/v2/views?tableId=${structures.generator.guid()}&tableId=${structures.generator.guid()}`
         )
@@ -90,20 +82,13 @@ describe("/v2/views", () => {
   })
 
   describe("getView", () => {
-    const getView = (viewId: string) => {
-      return request
-        .get(`/api/v2/views/${viewId}`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-    }
-
     let view: ViewV2
     beforeAll(async () => {
       view = await config.api.viewV2.create()
     })
 
     it("can fetch the expected view", async () => {
-      const res = await getView(view._id!).expect(200)
+      const res = await config.api.viewV2.get(view._id!)
       expect(res.status).toBe(200)
 
       expect(res.body).toEqual({
@@ -118,7 +103,9 @@ describe("/v2/views", () => {
     })
 
     it("will return 404 if the unnexisting id is provided", async () => {
-      await getView(structures.generator.guid()).expect(404)
+      await config.api.viewV2.get(structures.generator.guid(), {
+        expectStatus: 404,
+      })
     })
   })
 
@@ -128,19 +115,12 @@ describe("/v2/views", () => {
         name: generator.name(),
         tableId: config.table!._id!,
       }
-      const res = await request
-        .post(`/api/v2/views`)
-        .send(newView)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(201)
+      const res = await config.api.viewV2.create(newView)
 
-      expect(res.body).toEqual({
-        data: {
-          ...newView,
-          _id: expect.any(String),
-          _rev: expect.any(String),
-        },
+      expect(res).toEqual({
+        ...newView,
+        _id: expect.any(String),
+        _rev: expect.any(String),
       })
     })
   })
@@ -154,14 +134,11 @@ describe("/v2/views", () => {
     })
 
     it("can delete an existing view", async () => {
-      await config.api.viewV2.get(view._id!).expect(200)
+      await config.api.viewV2.get(view._id!, { expectStatus: 200 })
 
-      await request
-        .delete(`/api/v2/views/${view._id}`)
-        .set(config.defaultHeaders())
-        .expect(204)
+      await config.api.viewV2.delete(view._id!)
 
-      await config.api.viewV2.get(view._id!).expect(404)
+      await config.api.viewV2.get(view._id!, { expectStatus: 404 })
     })
   })
 })
diff --git a/packages/server/src/tests/utilities/api/viewV2.ts b/packages/server/src/tests/utilities/api/viewV2.ts
index 5783b77e58..a1e8f019cf 100644
--- a/packages/server/src/tests/utilities/api/viewV2.ts
+++ b/packages/server/src/tests/utilities/api/viewV2.ts
@@ -9,7 +9,10 @@ export class ViewV2API extends TestAPI {
     super(config)
   }
 
-  create = async (viewData?: Partial<ViewV2>) => {
+  create = async (
+    viewData?: Partial<ViewV2>,
+    { expectStatus } = { expectStatus: 201 }
+  ) => {
     if (!this.config.table) {
       throw "Test requires table to be configured."
     }
@@ -23,13 +26,40 @@ export class ViewV2API extends TestAPI {
       .send(view)
       .set(this.config.defaultHeaders())
       .expect("Content-Type", /json/)
-      .expect(201)
+      .expect(expectStatus)
     return result.body.data as ViewV2
   }
-  get = (viewId: string): supertest.Test => {
+
+  get = (
+    viewId: string,
+    { expectStatus } = { expectStatus: 200 }
+  ): supertest.Test => {
     return this.request
       .get(`/api/v2/views/${viewId}`)
       .set(this.config.defaultHeaders())
       .expect("Content-Type", /json/)
+      .expect(expectStatus)
+  }
+
+  fetch = async (
+    tableId?: string,
+    { expectStatus } = { expectStatus: 200 }
+  ) => {
+    let url = `/api/v2/views?`
+    if (tableId) {
+      url += `tableId=${tableId}&`
+    }
+    return this.request
+      .get(url)
+      .set(this.config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(expectStatus)
+  }
+
+  delete = async (viewId: string, { expectStatus } = { expectStatus: 204 }) => {
+    return this.request
+      .delete(`/api/v2/views/${viewId}`)
+      .set(this.config.defaultHeaders())
+      .expect(expectStatus)
   }
 }