MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

This commit is contained in:
adrinr 2023-03-20 16:28:35 +00:00
parent beb4118582
commit 10e465e07d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/worker/src/api/routes/global/tests/scim/groups.spec.ts
View File

@ -49,9 +49,9 @@ describe("/api/global/scim/v2/groups", () => {
const featureDisabledResponse = { const featureDisabledResponse = {
error: { error: {
code: "feature_disabled", code: "feature_disabled",
featureName: "scimIntegration", featureName: "scim",
}, },
message: "scimIntegration is not currently enabled", message: "scim is not currently enabled",
status: 400, status: 400,
} }

4
packages/worker/src/api/routes/global/tests/scim/users.spec.ts
View File

@ -77,9 +77,9 @@ describe("/api/global/scim/v2/users", () => {
const featureDisabledResponse = { const featureDisabledResponse = {
error: { error: {
code: "feature_disabled", code: "feature_disabled",
featureName: "scimIntegration", featureName: "scim",
}, },
message: "scimIntegration is not currently enabled", message: "scim is not currently enabled",
status: 400, status: 400,
} }