test: refactor e2e tests

khalilou88 · Oct 28, 2023 · 2d06283 · 2d06283
1 parent e27377f
commit 2d06283
Show file tree

Hide file tree

Showing 20 changed files with 11 additions and 64 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,16 +45,16 @@ jobs:
         run: npm i --legacy-peer-deps
 
       - name: Lint
-        run: npm run nx affected -- --target=lint --parallel=3
+        run: npm run nx run-many -- --target=lint --parallel=3
 
       - name: Unit tests
-        run: npm run nx affected -- --target=test --parallel=3 --ci --code-coverage
+        run: npm run nx run-many -- --target=test --parallel=3
 
       - name: Build
-        run: npm run nx affected -- --target=build --parallel=3
+        run: npm run nx run-many -- --target=build --parallel=3
 
       - name: E2E tests
-        run: npm run nx affected -- --target=e2e
+        run: npm run nx run-many -- --target=e2e
         env:
           NX_VERBOSE_LOGGING: 'true'
           GITHUB_ACTIONS: 'true'
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -41,7 +41,7 @@ jobs:
 
       - name: E2E tests
         id: e2e
-        run: npm run nx run-many -- --target=e2e --projects=jnxplus-nx-maven-e2e
+        run: npm run nx run-many -- --target=e2e --t="nx-maven spring-boot-parent-pom e2e"
         env:
           NX_VERBOSE_LOGGING: 'true'
           GITHUB_ACTIONS: 'true'

diff --git a/.github/workflows/nx-migrate.yml b/.github/workflows/nx-migrate.yml
@@ -85,7 +85,7 @@ jobs:
         id: e2e
         if: steps.nx-workspace-outdated.outputs.outdated == 'true'
         continue-on-error: true
-        run: npm run nx run-many -- --target=e2e --projects=nx-boot-gradle-e2e,nx-boot-maven-e2e
+        run: npm run nx run-many -- --target=e2e --t="nx-maven spring-boot-parent-pom e2e"
         env:
           NX_VERBOSE_LOGGING: 'true'
           GITHUB_ACTIONS: 'true'

diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
diff --git a/...e2e/tests/kt-multiplatform-preset.spec.ts → ...nx-gradle/kt-multiplatform-preset.spec.ts b/...e2e/tests/kt-multiplatform-preset.spec.ts → ...nx-gradle/kt-multiplatform-preset.spec.ts
diff --git a/...xplus-e2e/tests/nx-boot-gradle-kt.spec.ts → ...tests/nx-gradle/nx-boot-gradle-kt.spec.ts b/...xplus-e2e/tests/nx-boot-gradle-kt.spec.ts → ...tests/nx-gradle/nx-boot-gradle-kt.spec.ts
diff --git a/.../jnxplus-e2e/tests/nx-boot-gradle.spec.ts → ...2e/tests/nx-gradle/nx-boot-gradle.spec.ts b/.../jnxplus-e2e/tests/nx-boot-gradle.spec.ts → ...2e/tests/nx-gradle/nx-boot-gradle.spec.ts
diff --git a/...ts/jnxplus-e2e/tests/nx-gradle-kt.spec.ts → ...-e2e/tests/nx-gradle/nx-gradle-kt.spec.ts b/...ts/jnxplus-e2e/tests/nx-gradle-kt.spec.ts → ...-e2e/tests/nx-gradle/nx-gradle-kt.spec.ts
diff --git a/...-e2e/tests/nx-gradle-subfolder-kt.spec.ts → .../nx-gradle/nx-gradle-subfolder-kt.spec.ts b/...-e2e/tests/nx-gradle-subfolder-kt.spec.ts → .../nx-gradle/nx-gradle-subfolder-kt.spec.ts
diff --git a/...lus-e2e/tests/nx-gradle-subfolder.spec.ts → ...sts/nx-gradle/nx-gradle-subfolder.spec.ts b/...lus-e2e/tests/nx-gradle-subfolder.spec.ts → ...sts/nx-gradle/nx-gradle-subfolder.spec.ts
diff --git a/...jects/jnxplus-e2e/tests/nx-gradle.spec.ts → ...lus-e2e/tests/nx-gradle/nx-gradle.spec.ts b/...jects/jnxplus-e2e/tests/nx-gradle.spec.ts → ...lus-e2e/tests/nx-gradle/nx-gradle.spec.ts
diff --git a/...-e2e/tests/nx-micronaut-gradle-kt.spec.ts → .../nx-gradle/nx-micronaut-gradle-kt.spec.ts b/...-e2e/tests/nx-micronaut-gradle-kt.spec.ts → .../nx-gradle/nx-micronaut-gradle-kt.spec.ts
diff --git a/...lus-e2e/tests/nx-micronaut-gradle.spec.ts → ...sts/nx-gradle/nx-micronaut-gradle.spec.ts b/...lus-e2e/tests/nx-micronaut-gradle.spec.ts → ...sts/nx-gradle/nx-micronaut-gradle.spec.ts
diff --git a/...us-e2e/tests/nx-quarkus-gradle-kt.spec.ts → ...ts/nx-gradle/nx-quarkus-gradle-kt.spec.ts b/...us-e2e/tests/nx-quarkus-gradle-kt.spec.ts → ...ts/nx-gradle/nx-quarkus-gradle-kt.spec.ts
diff --git a/...xplus-e2e/tests/nx-quarkus-gradle.spec.ts → ...tests/nx-gradle/nx-quarkus-gradle.spec.ts b/...xplus-e2e/tests/nx-quarkus-gradle.spec.ts → ...tests/nx-gradle/nx-quarkus-gradle.spec.ts
diff --git a/...ojects/jnxplus-e2e/tests/nx-maven.spec.ts → ...nxplus-e2e/tests/nx-maven/all-bom.spec.ts b/...ojects/jnxplus-e2e/tests/nx-maven.spec.ts → ...nxplus-e2e/tests/nx-maven/all-bom.spec.ts
@@ -24,7 +24,7 @@ import { rmSync } from 'fs';
 import * as fse from 'fs-extra';
 import * as path from 'path';
 
-describe('nx-maven e2e', () => {
+describe('nx-maven all bom e2e', () => {
   let workspaceDirectory: string;
   const isCI =
     process.env.CI === 'true' || process.env.GITHUB_ACTIONS === 'true';

diff --git a/...plus-e2e/tests/nx-maven-subfolder.spec.ts → ...sts/nx-maven/maven-root-directory.spec.ts b/...plus-e2e/tests/nx-maven-subfolder.spec.ts → ...sts/nx-maven/maven-root-directory.spec.ts
@@ -25,7 +25,7 @@ import { rmSync } from 'fs';
 import * as fse from 'fs-extra';
 import * as path from 'path';
 
-describe('nx-maven e2e', () => {
+describe('nx-maven maven-root-directory e2e', () => {
   let workspaceDirectory: string;
   const isCI =
     process.env.CI === 'true' || process.env.GITHUB_ACTIONS === 'true';

diff --git a/...plus-e2e/tests/nx-micronaut-maven.spec.ts → ...sts/nx-maven/micronaut-parent-pom.spec.ts b/...plus-e2e/tests/nx-micronaut-maven.spec.ts → ...sts/nx-maven/micronaut-parent-pom.spec.ts
@@ -24,7 +24,7 @@ import { rmSync } from 'fs';
 import * as fse from 'fs-extra';
 import * as path from 'path';
 
-describe('nx-micronaut-maven e2e', () => {
+describe('nx-maven micronaut-parent-pom e2e', () => {
   let workspaceDirectory: string;
   const isCI =
     process.env.CI === 'true' || process.env.GITHUB_ACTIONS === 'true';

diff --git a/...nxplus-e2e/tests/nx-quarkus-maven.spec.ts → ...us-e2e/tests/nx-maven/quarkus-bom.spec.ts b/...nxplus-e2e/tests/nx-quarkus-maven.spec.ts → ...us-e2e/tests/nx-maven/quarkus-bom.spec.ts
@@ -24,7 +24,7 @@ import { rmSync } from 'fs';
 import * as fse from 'fs-extra';
 import * as path from 'path';
 
-describe('nx-quarkus-maven e2e', () => {
+describe('nx-maven quarkus bom e2e', () => {
   let workspaceDirectory: string;
   const isCI =
     process.env.CI === 'true' || process.env.GITHUB_ACTIONS === 'true';

diff --git a/...s/jnxplus-e2e/tests/nx-boot-maven.spec.ts → ...s/nx-maven/spring-boot-parent-pom.spec.ts b/...s/jnxplus-e2e/tests/nx-boot-maven.spec.ts → ...s/nx-maven/spring-boot-parent-pom.spec.ts
@@ -24,7 +24,7 @@ import { rmSync } from 'fs';
 import * as fse from 'fs-extra';
 import * as path from 'path';
 
-describe('nx-boot-maven e2e', () => {
+describe('nx-maven spring-boot-parent-pom e2e', () => {
   let workspaceDirectory: string;
   const isCI =
     process.env.CI === 'true' || process.env.GITHUB_ACTIONS === 'true';