1
0
Fork 0
mirror of synced 2024-07-04 05:50:57 +12:00

Merge pull request #10253 from Budibase/handle_removing_users

BUDI-6838 - Remove users on deactivation - Amend tests
This commit is contained in:
Adria Navarro 2023-04-11 14:21:08 +02:00 committed by GitHub
commit 37b56b8084
2 changed files with 8 additions and 41 deletions

View file

@ -399,53 +399,19 @@ describe("scim", () => {
})
it.each([false, "false", "False"])(
"can deactive an active user (sending %s)",
"deactivating an active user (sending %s) will delete it",
async activeValue => {
const body: ScimUpdateRequest = {
schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"],
Operations: [{ op: "Replace", path: "active", value: activeValue }],
}
const response = await patchScimUser({ id: user.id, body })
await patchScimUser(
{ id: user.id, body },
{ expect: 204, skipContentTypeCheck: true }
)
const expectedScimUser: ScimUserResponse = {
...user,
active: false,
}
expect(response).toEqual(expectedScimUser)
const persistedUser = await config.api.scimUsersAPI.find(user.id)
expect(persistedUser).toEqual(expectedScimUser)
}
)
it.each([true, "true", "True"])(
"can activate an inactive user (sending %s)",
async activeValue => {
// Deactivate user
await patchScimUser({
id: user.id,
body: {
schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"],
Operations: [{ op: "Replace", path: "active", value: true }],
},
})
const body: ScimUpdateRequest = {
schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"],
Operations: [{ op: "Replace", path: "active", value: activeValue }],
}
const response = await patchScimUser({ id: user.id, body })
const expectedScimUser: ScimUserResponse = {
...user,
active: true,
}
expect(response).toEqual(expectedScimUser)
const persistedUser = await config.api.scimUsersAPI.find(user.id)
expect(persistedUser).toEqual(expectedScimUser)
await config.api.scimUsersAPI.find(user.id, { expect: 404 })
}
)

View file

@ -4,6 +4,7 @@ import { TestAPI } from "../base"
const defaultConfig = {
expect: 200,
setHeaders: true,
skipContentTypeCheck: false,
}
export type RequestSettings = typeof defaultConfig
@ -27,7 +28,7 @@ export abstract class ScimTestAPI extends TestAPI {
"application/scim+json; charset=utf-8"
)
if (method !== "delete") {
if (method !== "delete" && !requestSettings?.skipContentTypeCheck) {
request = request.expect("Content-Type", /json/)
}