From e27377fa3c9fdaf7213e23dc789d81b3fdfd2623 Mon Sep 17 00:00:00 2001
From: khalilou88 <32600911+khalilou88@users.noreply.github.com>
Date: Fri, 27 Oct 2023 22:08:02 +0200
Subject: [PATCH] test: merge e2e projects (#569)

Co-authored-by: khalilou88 <khalilou88@users.noreply.github.com>
---
 testing-projects/jnxplus-e2e/project.json     |  2 +-
 .../tests/nx-boot-maven.spec.ts               |  0
 .../tests/nx-maven-subfolder.spec.ts          |  0
 .../tests/nx-maven.spec.ts                    |  0
 .../tests/nx-micronaut-maven.spec.ts          |  0
 .../tests/nx-quarkus-maven.spec.ts            |  0
 .../jnxplus-nx-maven-e2e/.eslintrc.json       | 18 -----------
 .../jnxplus-nx-maven-e2e/jest.config.ts       | 13 --------
 .../jnxplus-nx-maven-e2e/project.json         | 32 -------------------
 .../jnxplus-nx-maven-e2e/tsconfig.json        | 10 ------
 .../jnxplus-nx-maven-e2e/tsconfig.spec.json   | 14 --------
 11 files changed, 1 insertion(+), 88 deletions(-)
 rename testing-projects/{jnxplus-nx-maven-e2e => jnxplus-e2e}/tests/nx-boot-maven.spec.ts (100%)
 rename testing-projects/{jnxplus-nx-maven-e2e => jnxplus-e2e}/tests/nx-maven-subfolder.spec.ts (100%)
 rename testing-projects/{jnxplus-nx-maven-e2e => jnxplus-e2e}/tests/nx-maven.spec.ts (100%)
 rename testing-projects/{jnxplus-nx-maven-e2e => jnxplus-e2e}/tests/nx-micronaut-maven.spec.ts (100%)
 rename testing-projects/{jnxplus-nx-maven-e2e => jnxplus-e2e}/tests/nx-quarkus-maven.spec.ts (100%)
 delete mode 100644 testing-projects/jnxplus-nx-maven-e2e/.eslintrc.json
 delete mode 100644 testing-projects/jnxplus-nx-maven-e2e/jest.config.ts
 delete mode 100644 testing-projects/jnxplus-nx-maven-e2e/project.json
 delete mode 100644 testing-projects/jnxplus-nx-maven-e2e/tsconfig.json
 delete mode 100644 testing-projects/jnxplus-nx-maven-e2e/tsconfig.spec.json

diff --git a/testing-projects/jnxplus-e2e/project.json b/testing-projects/jnxplus-e2e/project.json
index 799c7dbed..3eb13f404 100644
--- a/testing-projects/jnxplus-e2e/project.json
+++ b/testing-projects/jnxplus-e2e/project.json
@@ -28,5 +28,5 @@
       }
     }
   },
-  "implicitDependencies": ["nx-gradle"]
+  "implicitDependencies": ["nx-gradle", "nx-maven"]
 }
diff --git a/testing-projects/jnxplus-nx-maven-e2e/tests/nx-boot-maven.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-boot-maven.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-nx-maven-e2e/tests/nx-boot-maven.spec.ts
rename to testing-projects/jnxplus-e2e/tests/nx-boot-maven.spec.ts
diff --git a/testing-projects/jnxplus-nx-maven-e2e/tests/nx-maven-subfolder.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-maven-subfolder.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-nx-maven-e2e/tests/nx-maven-subfolder.spec.ts
rename to testing-projects/jnxplus-e2e/tests/nx-maven-subfolder.spec.ts
diff --git a/testing-projects/jnxplus-nx-maven-e2e/tests/nx-maven.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-maven.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-nx-maven-e2e/tests/nx-maven.spec.ts
rename to testing-projects/jnxplus-e2e/tests/nx-maven.spec.ts
diff --git a/testing-projects/jnxplus-nx-maven-e2e/tests/nx-micronaut-maven.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-micronaut-maven.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-nx-maven-e2e/tests/nx-micronaut-maven.spec.ts
rename to testing-projects/jnxplus-e2e/tests/nx-micronaut-maven.spec.ts
diff --git a/testing-projects/jnxplus-nx-maven-e2e/tests/nx-quarkus-maven.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-quarkus-maven.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-nx-maven-e2e/tests/nx-quarkus-maven.spec.ts
rename to testing-projects/jnxplus-e2e/tests/nx-quarkus-maven.spec.ts
diff --git a/testing-projects/jnxplus-nx-maven-e2e/.eslintrc.json b/testing-projects/jnxplus-nx-maven-e2e/.eslintrc.json
deleted file mode 100644
index 9d9c0db55..000000000
--- a/testing-projects/jnxplus-nx-maven-e2e/.eslintrc.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
-    }
-  ]
-}
diff --git a/testing-projects/jnxplus-nx-maven-e2e/jest.config.ts b/testing-projects/jnxplus-nx-maven-e2e/jest.config.ts
deleted file mode 100644
index a3129705e..000000000
--- a/testing-projects/jnxplus-nx-maven-e2e/jest.config.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'jnxplus-nx-maven-e2e',
-  preset: '../../jest.preset.js',
-  testEnvironment: 'node',
-  transform: {
-    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
-  },
-  moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../coverage/e2e/jnxplus-nx-maven-e2e',
-  globalSetup: '../../tools/scripts/start-local-registry.ts',
-  globalTeardown: '../../tools/scripts/stop-local-registry.ts',
-};
diff --git a/testing-projects/jnxplus-nx-maven-e2e/project.json b/testing-projects/jnxplus-nx-maven-e2e/project.json
deleted file mode 100644
index a78a127fa..000000000
--- a/testing-projects/jnxplus-nx-maven-e2e/project.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "jnxplus-nx-maven-e2e",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "projectType": "application",
-  "sourceRoot": "testing-projects/jnxplus-nx-maven-e2e/tests",
-  "targets": {
-    "e2e": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "testing-projects/jnxplus-nx-maven-e2e/jest.config.ts",
-        "passWithNoTests": true,
-        "runInBand": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
-      },
-      "dependsOn": ["^build"]
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["testing-projects/jnxplus-nx-maven-e2e/**/*.ts"]
-      }
-    }
-  },
-  "implicitDependencies": ["nx-maven"]
-}
diff --git a/testing-projects/jnxplus-nx-maven-e2e/tsconfig.json b/testing-projects/jnxplus-nx-maven-e2e/tsconfig.json
deleted file mode 100644
index b9c9d9537..000000000
--- a/testing-projects/jnxplus-nx-maven-e2e/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}
diff --git a/testing-projects/jnxplus-nx-maven-e2e/tsconfig.spec.json b/testing-projects/jnxplus-nx-maven-e2e/tsconfig.spec.json
deleted file mode 100644
index 9b2a121d1..000000000
--- a/testing-projects/jnxplus-nx-maven-e2e/tsconfig.spec.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"]
-  },
-  "include": [
-    "jest.config.ts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
-}