Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 3 additions & 6 deletions apps/server-nestjs/test/argocd.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { faker } from '@faker-js/faker'
import { ConfigModule } from '@nestjs/config'
import { EventEmitter2 } from '@nestjs/event-emitter'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
import { afterAll, beforeAll, expect, it, vi } from 'vitest'
import { parse } from 'yaml'
import { baseConfigFactory } from '../src/config/base.config'
import { projectSelect } from '../src/modules/argocd/argocd-datastore.service'
Expand All @@ -20,12 +20,9 @@ import { LoggerModule } from '../src/modules/infrastructure/logger/logger.module
import { PermissionModule } from '../src/modules/infrastructure/permission/permission.module'
import { VaultClientService } from '../src/modules/vault/vault-client.service'
import { getDotenvPaths } from '../src/utils/dotenv.utils'
import { ARGOCD_RECONCILE_TIMEOUT, GITLAB_SYNC_TIMEOUT } from './constants'

const canRunArgoCDE2E
= Boolean(process.env.E2E)
import { describeWithArgoCD } from './argocd.utils'

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[🟡 Nit] Ordre des imports : regrouper ./argocd.utils avec les imports relatifs (après ./constants) pour rester dans le tri eslint.


const describeWithArgoCD = describe.runIf(canRunArgoCDE2E)
import { ARGOCD_RECONCILE_TIMEOUT, GITLAB_SYNC_TIMEOUT } from './constants'

describeWithArgoCD('ArgoCDService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/argocd.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚪ Suggestion] Seize fichiers jumeaux de cinq lignes (canRunX + describeWithX) : un util partagé describeWithE2E éviterait la duplication — sauf si un gate par service à court terme est l'objectif ; dans ce cas un commentaire d'intention suffit.

export const canRunArgoCDE2E = Boolean(process.env.E2E)

export const describeWithArgoCD = describe.runIf(canRunArgoCDE2E)
5 changes: 1 addition & 4 deletions apps/server-nestjs/test/gitlab.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ import { getDotenvPaths } from '../src/utils/dotenv.utils'
import { getAll } from '../src/utils/iterable.utils'
import { GITLAB_PURGE_SYNC_TIMEOUT, GITLAB_SYNC_TIMEOUT } from './constants'

const canRunGitlabE2E
= Boolean(process.env.E2E)

const describeWithGitLab = describe.runIf(canRunGitlabE2E)
import { describeWithGitLab } from './gitlab.utils'

describeWithGitLab('GitlabService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/gitlab.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunGitlabE2E = Boolean(process.env.E2E)

export const describeWithGitLab = describe.runIf(canRunGitlabE2E)
7 changes: 2 additions & 5 deletions apps/server-nestjs/test/keycloak.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Logger } from '@nestjs/common'
import { ConfigModule } from '@nestjs/config'
import { EventEmitter2 } from '@nestjs/event-emitter'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
import { afterAll, beforeAll, expect, it, vi } from 'vitest'
import z from 'zod'
import { baseConfigFactory } from '../src/config/base.config'
import { AuthModule } from '../src/modules/infrastructure/auth/auth.module'
Expand All @@ -20,10 +20,7 @@ import { KeycloakModule } from '../src/modules/keycloak/keycloak.module'
import { getDotenvPaths } from '../src/utils/dotenv.utils'
import { KEYCLOAK_GROUP_SYNC_TIMEOUT } from './constants'

const canRunKeycloakE2E
= Boolean(process.env.E2E)

const describeWithKeycloak = describe.runIf(canRunKeycloakE2E)
import { describeWithKeycloak } from './keycloak.utils'

describeWithKeycloak('KeycloakService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/keycloak.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunKeycloakE2E = Boolean(process.env.E2E)

export const describeWithKeycloak = describe.runIf(canRunKeycloakE2E)
7 changes: 2 additions & 5 deletions apps/server-nestjs/test/log.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { TestingModule } from '@nestjs/testing'
import { faker } from '@faker-js/faker'
import { ConfigModule } from '@nestjs/config'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
import { afterAll, beforeAll, expect, it, vi } from 'vitest'
import { baseConfigFactory } from '../src/config/base.config'
import { AuthModule } from '../src/modules/infrastructure/auth/auth.module'
import { DatabaseModule } from '../src/modules/infrastructure/database/database.module'
Expand All @@ -14,10 +14,7 @@ import { LogModule } from '../src/modules/log/log.module'
import { LogService } from '../src/modules/log/log.service'
import { getDotenvPaths } from '../src/utils/dotenv.utils'

const canRunLogE2E
= Boolean(process.env.E2E)

const describeWithLog = describe.runIf(canRunLogE2E)
import { describeWithLog } from './log.utils'

describeWithLog('LogService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/log.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunLogE2E = Boolean(process.env.E2E)

export const describeWithLog = describe.runIf(canRunLogE2E)
7 changes: 2 additions & 5 deletions apps/server-nestjs/test/nexus.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { faker } from '@faker-js/faker'
import { ConfigModule } from '@nestjs/config'
import { EventEmitter2 } from '@nestjs/event-emitter'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
import { afterAll, beforeAll, expect, it, vi } from 'vitest'
import { baseConfigFactory } from '../src/config/base.config'
import { AuthModule } from '../src/modules/infrastructure/auth/auth.module'
import { DatabaseModule } from '../src/modules/infrastructure/database/database.module'
Expand All @@ -24,10 +24,7 @@ import { VaultModule } from '../src/modules/vault/vault.module'
import { getDotenvPaths } from '../src/utils/dotenv.utils'
import { NEXUS_SYNC_TIMEOUT } from './constants'

const canRunNexusE2E
= Boolean(process.env.E2E)

const describeWithNexus = describe.runIf(canRunNexusE2E)
import { describeWithNexus } from './nexus.utils'

describeWithNexus('NexusService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/nexus.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunNexusE2E = Boolean(process.env.E2E)

export const describeWithNexus = describe.runIf(canRunNexusE2E)
14 changes: 2 additions & 12 deletions apps/server-nestjs/test/observability.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Logger } from '@nestjs/common'
import { ConfigModule } from '@nestjs/config'
import { EventEmitter2 } from '@nestjs/event-emitter'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
import { afterAll, beforeAll, expect, it, vi } from 'vitest'
import z from 'zod'
import { baseConfigFactory } from '../src/config/base.config'
import { GitlabClientService } from '../src/modules/gitlab/gitlab-client.service'
Expand All @@ -30,17 +30,7 @@ import { ObservabilityModule } from '../src/modules/observability/observability.
import { getDotenvPaths } from '../src/utils/dotenv.utils'
import { KEYCLOAK_GROUP_SYNC_TIMEOUT } from './constants'

const canRunObservabilityE2E
= Boolean(process.env.E2E)

const describeWithObservability = describe.runIf(canRunObservabilityE2E)

const ALL_GRAFANA_SUBGROUPS = [
GRAFANA_SUBGROUP_PROD_RW,
GRAFANA_SUBGROUP_PROD_RO,
GRAFANA_SUBGROUP_HPROD_RW,
GRAFANA_SUBGROUP_HPROD_RO,
] as const
import { ALL_GRAFANA_SUBGROUPS, describeWithObservability } from './observability.utils'

describeWithObservability('ObservabilityService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
18 changes: 18 additions & 0 deletions apps/server-nestjs/test/observability.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { describe } from 'vitest'
import {
GRAFANA_SUBGROUP_HPROD_RO,
GRAFANA_SUBGROUP_HPROD_RW,
GRAFANA_SUBGROUP_PROD_RO,
GRAFANA_SUBGROUP_PROD_RW,
} from '../src/modules/observability/observability.constants'

export const canRunObservabilityE2E = Boolean(process.env.E2E)

export const describeWithObservability = describe.runIf(canRunObservabilityE2E)

export const ALL_GRAFANA_SUBGROUPS = [

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[✨ Éloge] ALL_GRAFANA_SUBGROUPS déplacé dans le même mouvement : la constante partagée vit désormais là où est le gate, plus de dépendance à la spec observability.

GRAFANA_SUBGROUP_PROD_RW,
GRAFANA_SUBGROUP_PROD_RO,
GRAFANA_SUBGROUP_HPROD_RW,
GRAFANA_SUBGROUP_HPROD_RO,
] as const
6 changes: 2 additions & 4 deletions apps/server-nestjs/test/project-bulk.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { faker } from '@faker-js/faker'
import { ConfigModule } from '@nestjs/config'
import { EventEmitter2 } from '@nestjs/event-emitter'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
import { afterAll, beforeAll, expect, it, vi } from 'vitest'
import { baseConfigFactory } from '../src/config/base.config'
import { AuthModule } from '../src/modules/infrastructure/auth/auth.module'
import { DatabaseModule } from '../src/modules/infrastructure/database/database.module'
Expand All @@ -15,9 +15,7 @@ import { ProjectBulkModule } from '../src/modules/project-bulk/project-bulk.modu
import { ProjectBulkService } from '../src/modules/project-bulk/project-bulk.service'
import { getDotenvPaths } from '../src/utils/dotenv.utils'

const canRunProjectBulkE2E = Boolean(process.env.E2E)

const describeWithProjectBulk = describe.runIf(canRunProjectBulkE2E)
import { describeWithProjectBulk } from './project-bulk.utils'

describeWithProjectBulk('ProjectBulkService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/project-bulk.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunProjectBulkE2E = Boolean(process.env.E2E)

export const describeWithProjectBulk = describe.runIf(canRunProjectBulkE2E)
6 changes: 2 additions & 4 deletions apps/server-nestjs/test/project-hooks.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { faker } from '@faker-js/faker'
import { ConfigModule } from '@nestjs/config'
import { EventEmitter2 } from '@nestjs/event-emitter'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
import { afterAll, beforeAll, expect, it, vi } from 'vitest'
import { mockDeep } from 'vitest-mock-extended'
import { baseConfigFactory } from '../src/config/base.config'
import { AuthModule } from '../src/modules/infrastructure/auth/auth.module'
Expand All @@ -19,9 +19,7 @@ import { VaultClientService } from '../src/modules/vault/vault-client.service'
import { VaultService } from '../src/modules/vault/vault.service'
import { getDotenvPaths } from '../src/utils/dotenv.utils'

const canRunProjectHooksE2E = Boolean(process.env.E2E)

const describeWithProjectHooks = describe.runIf(canRunProjectHooksE2E)
import { describeWithProjectHooks } from './project-hooks.utils'

describeWithProjectHooks('ProjectHooksService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/project-hooks.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunProjectHooksE2E = Boolean(process.env.E2E)

export const describeWithProjectHooks = describe.runIf(canRunProjectHooksE2E)
4 changes: 1 addition & 3 deletions apps/server-nestjs/test/project-members.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ import { ProjectMembersModule } from '../src/modules/project-members/project-mem
import { ProjectMembersService } from '../src/modules/project-members/project-members.service'
import { getDotenvPaths } from '../src/utils/dotenv.utils'

const canRunProjectMembersE2E = Boolean(process.env.E2E)

const describeWithProjectMembers = describe.runIf(canRunProjectMembersE2E)
import { describeWithProjectMembers } from './project-members.utils'

describeWithProjectMembers('ProjectMembersService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/project-members.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunProjectMembersE2E = Boolean(process.env.E2E)

export const describeWithProjectMembers = describe.runIf(canRunProjectMembersE2E)
6 changes: 2 additions & 4 deletions apps/server-nestjs/test/project-roles.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { faker } from '@faker-js/faker'
import { ConfigModule } from '@nestjs/config'
import { EventEmitter2 } from '@nestjs/event-emitter'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
import { afterAll, beforeAll, expect, it, vi } from 'vitest'
import { baseConfigFactory } from '../src/config/base.config'
import { AuthModule } from '../src/modules/infrastructure/auth/auth.module'
import { DatabaseModule } from '../src/modules/infrastructure/database/database.module'
Expand All @@ -16,9 +16,7 @@ import { ProjectRolesModule } from '../src/modules/project-roles/project-roles.m
import { ProjectRolesService } from '../src/modules/project-roles/project-roles.service'
import { getDotenvPaths } from '../src/utils/dotenv.utils'

const canRunProjectRolesE2E = Boolean(process.env.E2E)

const describeWithProjectRoles = describe.runIf(canRunProjectRolesE2E)
import { describeWithProjectRoles } from './project-roles.utils'

describeWithProjectRoles('ProjectRolesService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/project-roles.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunProjectRolesE2E = Boolean(process.env.E2E)

export const describeWithProjectRoles = describe.runIf(canRunProjectRolesE2E)
5 changes: 1 addition & 4 deletions apps/server-nestjs/test/project-secrets.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ import { VaultClientService } from '../src/modules/vault/vault-client.service'
import { generateProjectPath } from '../src/modules/vault/vault.utils'
import { getDotenvPaths } from '../src/utils/dotenv.utils'

const canRunProjectSecretsE2E
= Boolean(process.env.E2E)

const describeWithProjectSecrets = describe.runIf(canRunProjectSecretsE2E)
import { describeWithProjectSecrets } from './project-secrets.utils'

describeWithProjectSecrets('ProjectSecretsService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/project-secrets.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunProjectSecretsE2E = Boolean(process.env.E2E)

export const describeWithProjectSecrets = describe.runIf(canRunProjectSecretsE2E)
5 changes: 2 additions & 3 deletions apps/server-nestjs/test/project-services.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { faker } from '@faker-js/faker'
import { NotFoundException } from '@nestjs/common'
import { ConfigModule } from '@nestjs/config'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
import { afterAll, beforeAll, expect, it, vi } from 'vitest'
import { baseConfigFactory } from '../src/config/base.config'
import { AuthModule } from '../src/modules/infrastructure/auth/auth.module'
import { DatabaseModule } from '../src/modules/infrastructure/database/database.module'
Expand All @@ -16,8 +16,7 @@ import { ProjectServicesModule } from '../src/modules/project-services/project-s
import { ProjectServicesService } from '../src/modules/project-services/project-services.service'
import { getDotenvPaths } from '../src/utils/dotenv.utils'

const canRunServicesE2E = Boolean(process.env.E2E)
const describeWithServices = describe.runIf(canRunServicesE2E)
import { describeWithServices } from './project-services.utils'

describeWithServices('ProjectServicesService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/project-services.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunServicesE2E = Boolean(process.env.E2E)

export const describeWithServices = describe.runIf(canRunServicesE2E)
4 changes: 1 addition & 3 deletions apps/server-nestjs/test/project.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ import { ProjectModule } from '../src/modules/project/project.module'
import { ProjectService } from '../src/modules/project/project.service'
import { getDotenvPaths } from '../src/utils/dotenv.utils'

const canRunProjectE2E = Boolean(process.env.E2E)

const describeWithProject = describe.runIf(canRunProjectE2E)
import { describeWithProject } from './project.utils'

describeWithProject('ProjectService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/project.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunProjectE2E = Boolean(process.env.E2E)

export const describeWithProject = describe.runIf(canRunProjectE2E)
7 changes: 2 additions & 5 deletions apps/server-nestjs/test/registry.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { faker } from '@faker-js/faker'
import { ConfigModule } from '@nestjs/config'
import { EventEmitter2 } from '@nestjs/event-emitter'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it } from 'vitest'
import { afterAll, beforeAll, expect, it } from 'vitest'
import { baseConfigFactory } from '../src/config/base.config'
import { harborConfigFactory } from '../src/config/harbor.config'
import { EventsModule } from '../src/modules/infrastructure/events/events.module'
Expand All @@ -19,10 +19,7 @@ import { VaultClientService } from '../src/modules/vault/vault-client.service'
import { getDotenvPaths } from '../src/utils/dotenv.utils'
import { getAll } from '../src/utils/iterable.utils'

const canRunRegistryE2E
= Boolean(process.env.E2E)

const describeWithRegistry = describe.runIf(canRunRegistryE2E)
import { describeWithRegistry } from './registry.utils'

describeWithRegistry('RegistryService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/registry.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunRegistryE2E = Boolean(process.env.E2E)

export const describeWithRegistry = describe.runIf(canRunRegistryE2E)
7 changes: 2 additions & 5 deletions apps/server-nestjs/test/sonarqube.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { faker } from '@faker-js/faker'
import { ConfigModule } from '@nestjs/config'
import { EventEmitter2 } from '@nestjs/event-emitter'
import { Test } from '@nestjs/testing'
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
import { afterAll, beforeAll, expect, it, vi } from 'vitest'
import { baseConfigFactory } from '../src/config/base.config'
import { gitlabConfigFactory } from '../src/config/gitlab.config'
import { GitlabClientService } from '../src/modules/gitlab/gitlab-client.service'
Expand All @@ -27,10 +27,7 @@ import { getDotenvPaths } from '../src/utils/dotenv.utils'
import { getAll } from '../src/utils/iterable.utils'
import { SONARQUBE_PROJECT_TIMEOUT } from './constants'

const canRunSonarqubeE2E
= Boolean(process.env.E2E)

const describeWithSonarqube = describe.runIf(canRunSonarqubeE2E)
import { describeWithSonarqube } from './sonarqube.utils'

describeWithSonarqube('SonarqubeService (e2e)', () => {
let moduleRef: TestingModule
Expand Down
5 changes: 5 additions & 0 deletions apps/server-nestjs/test/sonarqube.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { describe } from 'vitest'

export const canRunSonarqubeE2E = Boolean(process.env.E2E)

export const describeWithSonarqube = describe.runIf(canRunSonarqubeE2E)
Loading
Loading