From f8959aacb049312873ffe99143f2be8e16990230 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Tue, 14 Mar 2023 15:00:02 +0100
Subject: [PATCH] Fix merge conflicts

---
 .../routes/global/tests/scim/users.spec.ts    |  2 +-
 packages/worker/src/tests/api/scim/users.ts   | 26 ++-----------------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/packages/worker/src/api/routes/global/tests/scim/users.spec.ts b/packages/worker/src/api/routes/global/tests/scim/users.spec.ts
index bbf8f8eea2..f2188c2909 100644
--- a/packages/worker/src/api/routes/global/tests/scim/users.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/scim/users.spec.ts
@@ -301,7 +301,7 @@ describe("/api/global/scim/v2/users", () => {
   describe("DELETE /api/global/scim/v2/users/:id", () => {
     const deleteScimUser = config.api.scimUsersAPI.delete
 
-    let user: ScimUser
+    let user: ScimUserResponse
 
     beforeEach(async () => {
       const body = createScimCreateUserRequest()
diff --git a/packages/worker/src/tests/api/scim/users.ts b/packages/worker/src/tests/api/scim/users.ts
index 040ad4d14e..ec61504db3 100644
--- a/packages/worker/src/tests/api/scim/users.ts
+++ b/packages/worker/src/tests/api/scim/users.ts
@@ -26,9 +26,7 @@ export class ScimUsersAPI extends TestAPI {
     body?: object
   ) => {
     const { expect, setHeaders } = { ...defaultConfig, ...requestSettings }
-    let request =
-      this.request[method](url)
-      .expect(expect)
+    let request = this.request[method](url).expect(expect)
 
     if (method !== "delete") {
       request = request.expect("Content-Type", /json/)
@@ -100,32 +98,12 @@ export class ScimUsersAPI extends TestAPI {
     return res.body as ScimUserResponse
   }
 
-  patch = async (
-    {
-      id,
-      body,
-    }: {
-      id: string
-      body: ScimUpdateRequest
-    },
-    requestSettings?: Partial<RequestSettings>
-  ) => {
-    const res = await this.#createRequest(
-      `/api/global/scim/v2/users/${id}`,
-      "patch",
-      requestSettings,
-      body
-    )
-
-    return res.body as ScimUser
-  }
-
   delete = async (id: string, requestSettings?: Partial<RequestSettings>) => {
     const res = await this.#createRequest(
       `/api/global/scim/v2/users/${id}`,
       "delete",
       requestSettings
     )
-    return res.body as ScimUser
+    return res.body as ScimUserResponse
   }
 }