From 2d062836e310be56aade1d1bb98882e3946d99c3 Mon Sep 17 00:00:00 2001 From: khalilou88 Date: Sat, 28 Oct 2023 17:49:36 +0200 Subject: [PATCH] test: refactor e2e tests --- .github/workflows/ci.yml | 8 +-- .github/workflows/dependabot-auto-merge.yml | 2 +- .github/workflows/nx-migrate.yml | 2 +- .github/workflows/publish-plugin.yml | 53 ------------------- .../kt-multiplatform-preset.spec.ts | 0 .../{ => nx-gradle}/nx-boot-gradle-kt.spec.ts | 0 .../{ => nx-gradle}/nx-boot-gradle.spec.ts | 0 .../{ => nx-gradle}/nx-gradle-kt.spec.ts | 0 .../nx-gradle-subfolder-kt.spec.ts | 0 .../nx-gradle-subfolder.spec.ts | 0 .../tests/{ => nx-gradle}/nx-gradle.spec.ts | 0 .../nx-micronaut-gradle-kt.spec.ts | 0 .../nx-micronaut-gradle.spec.ts | 0 .../nx-quarkus-gradle-kt.spec.ts | 0 .../{ => nx-gradle}/nx-quarkus-gradle.spec.ts | 0 .../all-bom.spec.ts} | 2 +- .../maven-root-directory.spec.ts} | 2 +- .../micronaut-parent-pom.spec.ts} | 2 +- .../quarkus-bom.spec.ts} | 2 +- .../spring-boot-parent-pom.spec.ts} | 2 +- 20 files changed, 11 insertions(+), 64 deletions(-) delete mode 100644 .github/workflows/publish-plugin.yml rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/kt-multiplatform-preset.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/nx-boot-gradle-kt.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/nx-boot-gradle.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/nx-gradle-kt.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/nx-gradle-subfolder-kt.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/nx-gradle-subfolder.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/nx-gradle.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/nx-micronaut-gradle-kt.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/nx-micronaut-gradle.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/nx-quarkus-gradle-kt.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{ => nx-gradle}/nx-quarkus-gradle.spec.ts (100%) rename testing-projects/jnxplus-e2e/tests/{nx-maven.spec.ts => nx-maven/all-bom.spec.ts} (99%) rename testing-projects/jnxplus-e2e/tests/{nx-maven-subfolder.spec.ts => nx-maven/maven-root-directory.spec.ts} (99%) rename testing-projects/jnxplus-e2e/tests/{nx-micronaut-maven.spec.ts => nx-maven/micronaut-parent-pom.spec.ts} (99%) rename testing-projects/jnxplus-e2e/tests/{nx-quarkus-maven.spec.ts => nx-maven/quarkus-bom.spec.ts} (99%) rename testing-projects/jnxplus-e2e/tests/{nx-boot-maven.spec.ts => nx-maven/spring-boot-parent-pom.spec.ts} (99%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d332242a..a4d2989b8 100644 --- 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 index eb1d5f9da..4b5f2645f 100644 --- 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 index 8897b6203..ea4f98521 100644 --- 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 deleted file mode 100644 index 58c588fba..000000000 --- a/.github/workflows/publish-plugin.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Publish Plugin -on: - workflow_dispatch: - inputs: - plugin: - type: choice - description: Plugin - options: - - nx-maven - - nx-boot-maven - - nx-quarkus-maven - - nx-micronaut-maven - - nx-gradle - - nx-boot-gradle - - nx-quarkus-gradle - - nx-micronaut-gradle - -jobs: - publish_plugin: - name: Publishing plugin ${{ github.event.inputs.plugin }} - strategy: - matrix: - os: [ubuntu-latest] - node_version: ['18'] - java: ['17'] - fail-fast: true - runs-on: ${{ matrix.os }} - steps: - - name: Check out repository code - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Set up node - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node_version }} - cache: 'npm' - - - name: Install dependencies - run: npm i --legacy-peer-deps - - - name: Setup Git - run: | - git config user.name "${{ github.actor }}" - git config user.email "${{ github.actor }}@users.noreply.github.com" - - - name: Version - shell: bash - run: npx nx version ${{ github.event.inputs.plugin }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/testing-projects/jnxplus-e2e/tests/kt-multiplatform-preset.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/kt-multiplatform-preset.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/kt-multiplatform-preset.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/kt-multiplatform-preset.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-boot-gradle-kt.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/nx-boot-gradle-kt.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/nx-boot-gradle-kt.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/nx-boot-gradle-kt.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-boot-gradle.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/nx-boot-gradle.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/nx-boot-gradle.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/nx-boot-gradle.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-gradle-kt.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/nx-gradle-kt.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/nx-gradle-kt.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/nx-gradle-kt.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-gradle-subfolder-kt.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/nx-gradle-subfolder-kt.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/nx-gradle-subfolder-kt.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/nx-gradle-subfolder-kt.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-gradle-subfolder.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/nx-gradle-subfolder.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/nx-gradle-subfolder.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/nx-gradle-subfolder.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-gradle.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/nx-gradle.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/nx-gradle.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/nx-gradle.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-micronaut-gradle-kt.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/nx-micronaut-gradle-kt.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/nx-micronaut-gradle-kt.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/nx-micronaut-gradle-kt.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-micronaut-gradle.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/nx-micronaut-gradle.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/nx-micronaut-gradle.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/nx-micronaut-gradle.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-quarkus-gradle-kt.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/nx-quarkus-gradle-kt.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/nx-quarkus-gradle-kt.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/nx-quarkus-gradle-kt.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-quarkus-gradle.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/nx-quarkus-gradle.spec.ts similarity index 100% rename from testing-projects/jnxplus-e2e/tests/nx-quarkus-gradle.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-gradle/nx-quarkus-gradle.spec.ts diff --git a/testing-projects/jnxplus-e2e/tests/nx-maven.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-maven/all-bom.spec.ts similarity index 99% rename from testing-projects/jnxplus-e2e/tests/nx-maven.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-maven/all-bom.spec.ts index e75817960..2a6591336 100644 --- a/testing-projects/jnxplus-e2e/tests/nx-maven.spec.ts +++ b/testing-projects/jnxplus-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/testing-projects/jnxplus-e2e/tests/nx-maven-subfolder.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-maven/maven-root-directory.spec.ts similarity index 99% rename from testing-projects/jnxplus-e2e/tests/nx-maven-subfolder.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-maven/maven-root-directory.spec.ts index e42281382..c009d9fc7 100644 --- a/testing-projects/jnxplus-e2e/tests/nx-maven-subfolder.spec.ts +++ b/testing-projects/jnxplus-e2e/tests/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/testing-projects/jnxplus-e2e/tests/nx-micronaut-maven.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-maven/micronaut-parent-pom.spec.ts similarity index 99% rename from testing-projects/jnxplus-e2e/tests/nx-micronaut-maven.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-maven/micronaut-parent-pom.spec.ts index ed79e1878..b9cea9c96 100644 --- a/testing-projects/jnxplus-e2e/tests/nx-micronaut-maven.spec.ts +++ b/testing-projects/jnxplus-e2e/tests/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/testing-projects/jnxplus-e2e/tests/nx-quarkus-maven.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-maven/quarkus-bom.spec.ts similarity index 99% rename from testing-projects/jnxplus-e2e/tests/nx-quarkus-maven.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-maven/quarkus-bom.spec.ts index 5e23e39d0..f65998f39 100644 --- a/testing-projects/jnxplus-e2e/tests/nx-quarkus-maven.spec.ts +++ b/testing-projects/jnxplus-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/testing-projects/jnxplus-e2e/tests/nx-boot-maven.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-maven/spring-boot-parent-pom.spec.ts similarity index 99% rename from testing-projects/jnxplus-e2e/tests/nx-boot-maven.spec.ts rename to testing-projects/jnxplus-e2e/tests/nx-maven/spring-boot-parent-pom.spec.ts index abd2bf120..5be094244 100644 --- a/testing-projects/jnxplus-e2e/tests/nx-boot-maven.spec.ts +++ b/testing-projects/jnxplus-e2e/tests/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';