From 10e465e07d17bebc2cae456a92a813e72dcc22aa Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 20 Mar 2023 16:28:35 +0000 Subject: [PATCH] Fix merge conflicts --- .../worker/src/api/routes/global/tests/scim/groups.spec.ts | 4 ++-- .../worker/src/api/routes/global/tests/scim/users.spec.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/worker/src/api/routes/global/tests/scim/groups.spec.ts b/packages/worker/src/api/routes/global/tests/scim/groups.spec.ts index 04785f16e4..1ef2825254 100644 --- a/packages/worker/src/api/routes/global/tests/scim/groups.spec.ts +++ b/packages/worker/src/api/routes/global/tests/scim/groups.spec.ts @@ -49,9 +49,9 @@ describe("/api/global/scim/v2/groups", () => { const featureDisabledResponse = { error: { code: "feature_disabled", - featureName: "scimIntegration", + featureName: "scim", }, - message: "scimIntegration is not currently enabled", + message: "scim is not currently enabled", status: 400, } 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 5d5ff3f17b..c8753af405 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 @@ -77,9 +77,9 @@ describe("/api/global/scim/v2/users", () => { const featureDisabledResponse = { error: { code: "feature_disabled", - featureName: "scimIntegration", + featureName: "scim", }, - message: "scimIntegration is not currently enabled", + message: "scim is not currently enabled", status: 400, }