Skip to content

fix: GitLab integration test leaking undeleted users #2102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shikanime merged 1 commit into from
Apr 21, 2026
Merged

fix: GitLab integration test leaking undeleted users #2102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 89 additions & 76 deletions apps/server-nestjs/test/gitlab.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,31 @@ describeWithGitLab('GitlabController (e2e)', {}, () => {
type: 'human',
},
})

await prisma.project.create({
data: {
id: testProjectId,
slug: testProjectSlug,
name: testProjectSlug,
ownerId,
description: 'E2E Test Project',
hprodCpu: 0,
hprodGpu: 0,
hprodMemory: 0,
prodCpu: 0,
prodGpu: 0,
prodMemory: 0,
},
})

await prisma.repository.create({
data: {
projectId: testProjectId,
internalRepoName: 'app',
externalRepoUrl: 'https://example.com/example.git',
isPrivate: false,
},
})
})

afterAll(async () => {
Expand All @@ -104,39 +129,17 @@ describeWithGitLab('GitlabController (e2e)', {}, () => {
await prisma.user.deleteMany({ where: { id: ownerId } }).catch(() => {})
}

if (ownerUser?.id) {
await gitlabClient.Users.remove(ownerUser.id).catch(() => {})
}

await moduleRef.close()

vi.restoreAllMocks()
vi.unstubAllEnvs()
})

it('should reconcile and create project group in GitLab and Vault secrets', async () => {
// Create Project in DB
await prisma.project.create({
data: {
id: testProjectId,
slug: testProjectSlug,
name: testProjectSlug,
ownerId,
description: 'E2E Test Project',
hprodCpu: 0,
hprodGpu: 0,
hprodMemory: 0,
prodCpu: 0,
prodGpu: 0,
prodMemory: 0,
},
})

await prisma.repository.create({
data: {
projectId: testProjectId,
internalRepoName: 'app',
externalRepoUrl: 'https://example.com/example.git',
isPrivate: false,
},
})

const project = await prisma.project.findUniqueOrThrow({
where: { id: testProjectId },
select: projectSelect,
Expand Down Expand Up @@ -166,58 +169,68 @@ describeWithGitLab('GitlabController (e2e)', {}, () => {
expect(repoSecret?.data?.GIT_OUTPUT_PASSWORD).toBeTruthy()
}, 72000)

it('should add member to GitLab group when added in DB', async () => {
// Create user in GitLab
const newUserId = faker.string.uuid()
const newUser = await gitlabClient.Users.create({
email: faker.internet.email().toLowerCase(),
username: faker.internet.username(),
name: `${faker.person.firstName()} ${faker.person.lastName()}`,
password: faker.internet.password({ length: 24 }),
skipConfirmation: true,
})

// Create user in DB
await prisma.user.create({
data: {
id: newUserId,
email: newUser.email,
firstName: 'Test',
lastName: 'User',
type: 'human',
},
describe('project members', () => {
let newUserId: string | undefined
let newUserGitlabId: number | undefined

beforeAll(async () => {
newUserId = faker.string.uuid()
const newUser = await gitlabClient.Users.create({
email: faker.internet.email().toLowerCase(),
username: faker.internet.username(),
name: `${faker.person.firstName()} ${faker.person.lastName()}`,
password: faker.internet.password({ length: 24 }),
skipConfirmation: true,
})
newUserGitlabId = newUser.id

await prisma.user.create({
data: {
id: newUserId,
email: newUser.email,
firstName: 'Test',
lastName: 'User',
type: 'human',
},
})

await prisma.projectMembers.create({
data: {
projectId: testProjectId,
userId: newUserId,
roleIds: [],
},
})
})

// Add member to project in DB
await prisma.projectMembers.create({
data: {
projectId: testProjectId,
userId: newUserId,
roleIds: [], // No roles for now
},
})

const project = await prisma.project.findUniqueOrThrow({
where: { id: testProjectId },
select: projectSelect,
afterAll(async () => {
if (newUserGitlabId) {
await gitlabClient.Users.remove(newUserGitlabId).catch(() => {})
}
if (prisma && newUserId) {
await prisma.projectMembers.deleteMany({ where: { userId: newUserId } }).catch(() => {})
await prisma.user.deleteMany({ where: { id: newUserId } }).catch(() => {})
}
})

// Act
await gitlabController.handleUpsert(project)

// Assert
const groupPath = `${config.projectRootDir}/${testProjectSlug}`
const group = z.object({
id: z.number(),
name: z.string(),
web_url: z.string(),
}).parse(await gitlabService.getGroupByPath(groupPath))

const members = await gitlabService.getGroupMembers(group)
const isNewMemberPresent = members.some(m => m.id === newUser.id)
expect(isNewMemberPresent).toBe(true)

await prisma.projectMembers.deleteMany({ where: { userId: newUserId } }).catch(() => {})
await prisma.user.delete({ where: { id: newUserId } }).catch(() => {})
}, 72000)
it('should add member to GitLab group when added in DB', async () => {
const project = await prisma.project.findUniqueOrThrow({
where: { id: testProjectId },
select: projectSelect,
})

await gitlabController.handleUpsert(project)

const groupPath = `${config.projectRootDir}/${testProjectSlug}`
const group = z.object({
id: z.number(),
name: z.string(),
web_url: z.string(),
}).parse(await gitlabService.getGroupByPath(groupPath))

const members = await gitlabService.getGroupMembers(group)
const isNewMemberPresent = members.some(m => m.id === newUserGitlabId)
expect(isNewMemberPresent).toBe(true)
}, 72000)
})
})
Loading