From 49980dadf16faf5e969d0047504ade1e0dede4b2 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 19 Jul 2023 12:50:52 +0200
Subject: [PATCH] Fix merge conflicts

---
 .../src/api/routes/tests/viewV2.spec.ts       | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index cc05a17e25..3b628d584c 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -94,11 +94,7 @@ describe("/v2/views", () => {
 
     it("returns views with query info", async () => {
       const newView = await config.api.viewV2.create({ ...viewFilters })
-      const res = await request
-        .get(`/api/v2/views?tableId=${config.table!._id}`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
+      const res = await config.api.viewV2.fetch(config.table!._id)
 
       expect(res.body.views.length).toBe(11)
       expect(newView.query).toEqual({ allOr: false, equal: { field: "value" } })
@@ -164,20 +160,13 @@ describe("/v2/views", () => {
         tableId: config.table!._id!,
         ...viewFilters,
       }
-      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,
-          ...viewFilters,
-          _id: expect.any(String),
-          _rev: expect.any(String),
-        },
+      expect(res).toEqual({
+        ...newView,
+        ...viewFilters,
+        _id: expect.any(String),
+        _rev: expect.any(String),
       })
     })
   })