diff --git a/apps/server-nestjs/test/argocd.e2e-spec.ts b/apps/server-nestjs/test/argocd.e2e-spec.ts index 107d665d2b..bdaa1f7082 100644 --- a/apps/server-nestjs/test/argocd.e2e-spec.ts +++ b/apps/server-nestjs/test/argocd.e2e-spec.ts @@ -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' @@ -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' -const describeWithArgoCD = describe.runIf(canRunArgoCDE2E) +import { ARGOCD_RECONCILE_TIMEOUT, GITLAB_SYNC_TIMEOUT } from './constants' describeWithArgoCD('ArgoCDService (e2e)', () => { let moduleRef: TestingModule diff --git a/apps/server-nestjs/test/argocd.utils.ts b/apps/server-nestjs/test/argocd.utils.ts new file mode 100644 index 0000000000..26a93095fd --- /dev/null +++ b/apps/server-nestjs/test/argocd.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunArgoCDE2E = Boolean(process.env.E2E) + +export const describeWithArgoCD = describe.runIf(canRunArgoCDE2E) diff --git a/apps/server-nestjs/test/gitlab.e2e-spec.ts b/apps/server-nestjs/test/gitlab.e2e-spec.ts index 2c1c2c501e..85edad6314 100644 --- a/apps/server-nestjs/test/gitlab.e2e-spec.ts +++ b/apps/server-nestjs/test/gitlab.e2e-spec.ts @@ -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 diff --git a/apps/server-nestjs/test/gitlab.utils.ts b/apps/server-nestjs/test/gitlab.utils.ts new file mode 100644 index 0000000000..a5f07274a1 --- /dev/null +++ b/apps/server-nestjs/test/gitlab.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunGitlabE2E = Boolean(process.env.E2E) + +export const describeWithGitLab = describe.runIf(canRunGitlabE2E) diff --git a/apps/server-nestjs/test/keycloak.e2e-spec.ts b/apps/server-nestjs/test/keycloak.e2e-spec.ts index 5abcb02576..5894429144 100644 --- a/apps/server-nestjs/test/keycloak.e2e-spec.ts +++ b/apps/server-nestjs/test/keycloak.e2e-spec.ts @@ -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' @@ -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 diff --git a/apps/server-nestjs/test/keycloak.utils.ts b/apps/server-nestjs/test/keycloak.utils.ts new file mode 100644 index 0000000000..79ac215317 --- /dev/null +++ b/apps/server-nestjs/test/keycloak.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunKeycloakE2E = Boolean(process.env.E2E) + +export const describeWithKeycloak = describe.runIf(canRunKeycloakE2E) diff --git a/apps/server-nestjs/test/log.e2e-spec.ts b/apps/server-nestjs/test/log.e2e-spec.ts index 4d81a4e725..1a43a6813f 100644 --- a/apps/server-nestjs/test/log.e2e-spec.ts +++ b/apps/server-nestjs/test/log.e2e-spec.ts @@ -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' @@ -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 diff --git a/apps/server-nestjs/test/log.utils.ts b/apps/server-nestjs/test/log.utils.ts new file mode 100644 index 0000000000..fff6af51d5 --- /dev/null +++ b/apps/server-nestjs/test/log.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunLogE2E = Boolean(process.env.E2E) + +export const describeWithLog = describe.runIf(canRunLogE2E) diff --git a/apps/server-nestjs/test/nexus.e2e-spec.ts b/apps/server-nestjs/test/nexus.e2e-spec.ts index 3c0d31f7ef..4b95d69bb5 100644 --- a/apps/server-nestjs/test/nexus.e2e-spec.ts +++ b/apps/server-nestjs/test/nexus.e2e-spec.ts @@ -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' @@ -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 diff --git a/apps/server-nestjs/test/nexus.utils.ts b/apps/server-nestjs/test/nexus.utils.ts new file mode 100644 index 0000000000..9ca44b7b67 --- /dev/null +++ b/apps/server-nestjs/test/nexus.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunNexusE2E = Boolean(process.env.E2E) + +export const describeWithNexus = describe.runIf(canRunNexusE2E) diff --git a/apps/server-nestjs/test/observability.e2e-spec.ts b/apps/server-nestjs/test/observability.e2e-spec.ts index 4d79f6ee85..1d8d2d4d60 100644 --- a/apps/server-nestjs/test/observability.e2e-spec.ts +++ b/apps/server-nestjs/test/observability.e2e-spec.ts @@ -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' @@ -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 diff --git a/apps/server-nestjs/test/observability.utils.ts b/apps/server-nestjs/test/observability.utils.ts new file mode 100644 index 0000000000..a98d84bc29 --- /dev/null +++ b/apps/server-nestjs/test/observability.utils.ts @@ -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 = [ + GRAFANA_SUBGROUP_PROD_RW, + GRAFANA_SUBGROUP_PROD_RO, + GRAFANA_SUBGROUP_HPROD_RW, + GRAFANA_SUBGROUP_HPROD_RO, +] as const diff --git a/apps/server-nestjs/test/project-bulk.e2e-spec.ts b/apps/server-nestjs/test/project-bulk.e2e-spec.ts index 8548971e55..b3c3f60c7e 100644 --- a/apps/server-nestjs/test/project-bulk.e2e-spec.ts +++ b/apps/server-nestjs/test/project-bulk.e2e-spec.ts @@ -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' @@ -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 diff --git a/apps/server-nestjs/test/project-bulk.utils.ts b/apps/server-nestjs/test/project-bulk.utils.ts new file mode 100644 index 0000000000..61a5f4860c --- /dev/null +++ b/apps/server-nestjs/test/project-bulk.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunProjectBulkE2E = Boolean(process.env.E2E) + +export const describeWithProjectBulk = describe.runIf(canRunProjectBulkE2E) diff --git a/apps/server-nestjs/test/project-hooks.e2e-spec.ts b/apps/server-nestjs/test/project-hooks.e2e-spec.ts index 91d56e504f..8b5ef6d7b0 100644 --- a/apps/server-nestjs/test/project-hooks.e2e-spec.ts +++ b/apps/server-nestjs/test/project-hooks.e2e-spec.ts @@ -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' @@ -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 diff --git a/apps/server-nestjs/test/project-hooks.utils.ts b/apps/server-nestjs/test/project-hooks.utils.ts new file mode 100644 index 0000000000..454183c437 --- /dev/null +++ b/apps/server-nestjs/test/project-hooks.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunProjectHooksE2E = Boolean(process.env.E2E) + +export const describeWithProjectHooks = describe.runIf(canRunProjectHooksE2E) diff --git a/apps/server-nestjs/test/project-members.e2e-spec.ts b/apps/server-nestjs/test/project-members.e2e-spec.ts index 315bdba2dd..c26d578e6a 100644 --- a/apps/server-nestjs/test/project-members.e2e-spec.ts +++ b/apps/server-nestjs/test/project-members.e2e-spec.ts @@ -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 diff --git a/apps/server-nestjs/test/project-members.utils.ts b/apps/server-nestjs/test/project-members.utils.ts new file mode 100644 index 0000000000..c5c53ec499 --- /dev/null +++ b/apps/server-nestjs/test/project-members.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunProjectMembersE2E = Boolean(process.env.E2E) + +export const describeWithProjectMembers = describe.runIf(canRunProjectMembersE2E) diff --git a/apps/server-nestjs/test/project-roles.e2e-spec.ts b/apps/server-nestjs/test/project-roles.e2e-spec.ts index 3f180330d0..7ba874ae8a 100644 --- a/apps/server-nestjs/test/project-roles.e2e-spec.ts +++ b/apps/server-nestjs/test/project-roles.e2e-spec.ts @@ -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' @@ -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 diff --git a/apps/server-nestjs/test/project-roles.utils.ts b/apps/server-nestjs/test/project-roles.utils.ts new file mode 100644 index 0000000000..cd4a4cca74 --- /dev/null +++ b/apps/server-nestjs/test/project-roles.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunProjectRolesE2E = Boolean(process.env.E2E) + +export const describeWithProjectRoles = describe.runIf(canRunProjectRolesE2E) diff --git a/apps/server-nestjs/test/project-secrets.e2e-spec.ts b/apps/server-nestjs/test/project-secrets.e2e-spec.ts index 037cb7e1e0..f133692a41 100644 --- a/apps/server-nestjs/test/project-secrets.e2e-spec.ts +++ b/apps/server-nestjs/test/project-secrets.e2e-spec.ts @@ -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 diff --git a/apps/server-nestjs/test/project-secrets.utils.ts b/apps/server-nestjs/test/project-secrets.utils.ts new file mode 100644 index 0000000000..338938c080 --- /dev/null +++ b/apps/server-nestjs/test/project-secrets.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunProjectSecretsE2E = Boolean(process.env.E2E) + +export const describeWithProjectSecrets = describe.runIf(canRunProjectSecretsE2E) diff --git a/apps/server-nestjs/test/project-services.e2e-spec.ts b/apps/server-nestjs/test/project-services.e2e-spec.ts index 4a8b41f222..52380e69d2 100644 --- a/apps/server-nestjs/test/project-services.e2e-spec.ts +++ b/apps/server-nestjs/test/project-services.e2e-spec.ts @@ -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' @@ -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 diff --git a/apps/server-nestjs/test/project-services.utils.ts b/apps/server-nestjs/test/project-services.utils.ts new file mode 100644 index 0000000000..5147b3f4e7 --- /dev/null +++ b/apps/server-nestjs/test/project-services.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunServicesE2E = Boolean(process.env.E2E) + +export const describeWithServices = describe.runIf(canRunServicesE2E) diff --git a/apps/server-nestjs/test/project.e2e-spec.ts b/apps/server-nestjs/test/project.e2e-spec.ts index 0a670aa45a..65e3d0a5c5 100644 --- a/apps/server-nestjs/test/project.e2e-spec.ts +++ b/apps/server-nestjs/test/project.e2e-spec.ts @@ -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 diff --git a/apps/server-nestjs/test/project.utils.ts b/apps/server-nestjs/test/project.utils.ts new file mode 100644 index 0000000000..3bc52bde7c --- /dev/null +++ b/apps/server-nestjs/test/project.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunProjectE2E = Boolean(process.env.E2E) + +export const describeWithProject = describe.runIf(canRunProjectE2E) diff --git a/apps/server-nestjs/test/registry.e2e-spec.ts b/apps/server-nestjs/test/registry.e2e-spec.ts index 5f0b982883..52a28ad5b4 100644 --- a/apps/server-nestjs/test/registry.e2e-spec.ts +++ b/apps/server-nestjs/test/registry.e2e-spec.ts @@ -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' @@ -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 diff --git a/apps/server-nestjs/test/registry.utils.ts b/apps/server-nestjs/test/registry.utils.ts new file mode 100644 index 0000000000..582a14773c --- /dev/null +++ b/apps/server-nestjs/test/registry.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunRegistryE2E = Boolean(process.env.E2E) + +export const describeWithRegistry = describe.runIf(canRunRegistryE2E) diff --git a/apps/server-nestjs/test/sonarqube.e2e-spec.ts b/apps/server-nestjs/test/sonarqube.e2e-spec.ts index ac301a8a53..ea0ea683c6 100644 --- a/apps/server-nestjs/test/sonarqube.e2e-spec.ts +++ b/apps/server-nestjs/test/sonarqube.e2e-spec.ts @@ -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' @@ -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 diff --git a/apps/server-nestjs/test/sonarqube.utils.ts b/apps/server-nestjs/test/sonarqube.utils.ts new file mode 100644 index 0000000000..8b8afeab4d --- /dev/null +++ b/apps/server-nestjs/test/sonarqube.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunSonarqubeE2E = Boolean(process.env.E2E) + +export const describeWithSonarqube = describe.runIf(canRunSonarqubeE2E) diff --git a/apps/server-nestjs/test/vault.e2e-spec.ts b/apps/server-nestjs/test/vault.e2e-spec.ts index 8404cbcdcf..87492e12b3 100644 --- a/apps/server-nestjs/test/vault.e2e-spec.ts +++ b/apps/server-nestjs/test/vault.e2e-spec.ts @@ -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' @@ -18,10 +18,7 @@ import { VaultModule } from '../src/modules/vault/vault.module' import { getDotenvPaths } from '../src/utils/dotenv.utils' import { VAULT_PROVISION_TIMEOUT } from './constants' -const canRunVaultE2E - = Boolean(process.env.E2E) - -const describeWithVault = describe.runIf(canRunVaultE2E) +import { describeWithVault } from './vault.utils' describeWithVault('VaultService (e2e)', () => { let moduleRef: TestingModule diff --git a/apps/server-nestjs/test/vault.utils.ts b/apps/server-nestjs/test/vault.utils.ts new file mode 100644 index 0000000000..34d43ec216 --- /dev/null +++ b/apps/server-nestjs/test/vault.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunVaultE2E = Boolean(process.env.E2E) + +export const describeWithVault = describe.runIf(canRunVaultE2E) diff --git a/apps/server-nestjs/test/zone.e2e-spec.ts b/apps/server-nestjs/test/zone.e2e-spec.ts index 76123f904a..98cc28af40 100644 --- a/apps/server-nestjs/test/zone.e2e-spec.ts +++ b/apps/server-nestjs/test/zone.e2e-spec.ts @@ -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' @@ -18,9 +18,7 @@ import { VaultService } from '../src/modules/vault/vault.service' import { getDotenvPaths } from '../src/utils/dotenv.utils' import { VAULT_PROVISION_TIMEOUT } from './constants' -const canRunZoneE2E = Boolean(process.env.E2E) - -const describeWithZone = describe.runIf(canRunZoneE2E) +import { describeWithZone } from './zone.utils' describeWithZone('Zone lifecycle (e2e)', () => { let moduleRef: TestingModule diff --git a/apps/server-nestjs/test/zone.utils.ts b/apps/server-nestjs/test/zone.utils.ts new file mode 100644 index 0000000000..2b9ba9881a --- /dev/null +++ b/apps/server-nestjs/test/zone.utils.ts @@ -0,0 +1,5 @@ +import { describe } from 'vitest' + +export const canRunZoneE2E = Boolean(process.env.E2E) + +export const describeWithZone = describe.runIf(canRunZoneE2E)