test: use nx-gradle and nx-maven in smoke tests

khalilou88 · Aug 22, 2023 · 4d7b414 · 4d7b414
1 parent b4a3598
commit 4d7b414
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 61 deletions.
diff --git a/testing-projects/smoke/nx-boot-gradle-smoke/project.json b/testing-projects/smoke/nx-boot-gradle-smoke/project.json
@@ -12,5 +12,5 @@
     }
   },
   "tags": [],
-  "implicitDependencies": ["nx-boot-gradle"]
+  "implicitDependencies": ["nx-gradle"]
 }
diff --git a/testing-projects/smoke/nx-boot-gradle-smoke/tests/nx-boot-gradle.spec.ts b/testing-projects/smoke/nx-boot-gradle-smoke/tests/nx-boot-gradle.spec.ts
@@ -30,7 +30,7 @@ const testLib2 = uniq('test-lib2');
 const testApp3 = uniq('test-app3');
 const testApp4 = uniq('test-app4');
 
-describe('@jnxplus/nx-boot-gradle smoke', () => {
+describe('@jnxplus/nx-gradle spring-boot smoke', () => {
   beforeEach(async () => {
     ({ name: smokeDirectory, removeCallback: cleanup } = dirSync({
       unsafeCleanup: true,
@@ -53,37 +53,40 @@ describe('@jnxplus/nx-boot-gradle smoke', () => {
 
     execSync('git init', execSyncOptions());
 
-    execSync('npm i --save-dev @jnxplus/nx-boot-gradle', execSyncOptions());
+    execSync('npm i --save-dev @jnxplus/nx-gradle', execSyncOptions());
 
-    execSync('npx nx generate @jnxplus/nx-boot-gradle:init', execSyncOptions());
+    execSync(
+      'npx nx generate @jnxplus/nx-gradle:init --preset spring-boot',
+      execSyncOptions()
+    );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-gradle:application ${testApp}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp} --framework spring-boot`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-gradle:lib ${testLib} --projects ${testApp}`,
+      `npx nx g @jnxplus/nx-gradle:lib ${testLib} --framework spring-boot --projects ${testApp}`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-gradle:application ${testApp2}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp2} --framework spring-boot`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-gradle:application ${testApp3}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp3} --framework spring-boot`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-gradle:application ${testApp4}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp4} --framework spring-boot`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-gradle:lib ${testLib2} --projects ${testApp2},${testApp3},${testApp4}`,
+      `npx nx g @jnxplus/nx-gradle:lib ${testLib2} --framework spring-boot --projects ${testApp2},${testApp3},${testApp4}`,
       execSyncOptions()
     );
 

diff --git a/testing-projects/smoke/nx-boot-maven-smoke/project.json b/testing-projects/smoke/nx-boot-maven-smoke/project.json
@@ -12,5 +12,5 @@
     }
   },
   "tags": [],
-  "implicitDependencies": ["nx-boot-maven"]
+  "implicitDependencies": ["nx-maven"]
 }
diff --git a/testing-projects/smoke/nx-boot-maven-smoke/tests/nx-boot-maven.spec.ts b/testing-projects/smoke/nx-boot-maven-smoke/tests/nx-boot-maven.spec.ts
@@ -30,7 +30,7 @@ const testLib2 = uniq('test-lib2');
 const testApp3 = uniq('test-app3');
 const testApp4 = uniq('test-app4');
 
-describe('@jnxplus/nx-boot-maven smoke', () => {
+describe('@jnxplus/nx-maven spring-boot smoke', () => {
   beforeEach(async () => {
     ({ name: smokeDirectory, removeCallback: cleanup } = dirSync({
       unsafeCleanup: true,
@@ -53,37 +53,40 @@ describe('@jnxplus/nx-boot-maven smoke', () => {
 
     execSync('git init', execSyncOptions());
 
-    execSync('npm i --save-dev @jnxplus/nx-boot-maven', execSyncOptions());
+    execSync('npm i --save-dev @jnxplus/nx-maven', execSyncOptions());
 
-    execSync('npx nx generate @jnxplus/nx-boot-maven:init', execSyncOptions());
+    execSync(
+      'npx nx generate @jnxplus/nx-maven:init --dependencyManagement spring-boot-parent-pom',
+      execSyncOptions()
+    );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-maven:application ${testApp}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp} --framework spring-boot`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-maven:lib ${testLib} --projects ${testApp}`,
+      `npx nx g @jnxplus/nx-maven:lib ${testLib} --framework spring-boot --projects ${testApp}`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-maven:application ${testApp2}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp2} --framework spring-boot`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-maven:application ${testApp3}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp3} --framework spring-boot`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-maven:application ${testApp4}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp4} --framework spring-boot`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-boot-maven:lib ${testLib2} --projects ${testApp2},${testApp3},${testApp4}`,
+      `npx nx g @jnxplus/nx-maven:lib ${testLib2} --framework spring-boot --projects ${testApp2},${testApp3},${testApp4}`,
       execSyncOptions()
     );
 

diff --git a/testing-projects/smoke/nx-micronaut-gradle-smoke/tests/nx-micronaut-gradle.spec.ts b/testing-projects/smoke/nx-micronaut-gradle-smoke/tests/nx-micronaut-gradle.spec.ts
@@ -29,7 +29,7 @@ const testLib2 = uniq('test-lib2');
 const testApp3 = uniq('test-app3');
 const testApp4 = uniq('test-app4');
 
-describe('@jnxplus/nx-micronaut-gradle smoke', () => {
+describe('@jnxplus/nx-gradle micronaut smoke', () => {
   beforeEach(async () => {
     ({ name: smokeDirectory, removeCallback: cleanup } = dirSync({
       unsafeCleanup: true,
@@ -52,43 +52,40 @@ describe('@jnxplus/nx-micronaut-gradle smoke', () => {
 
     execSync('git init', execSyncOptions());
 
-    execSync(
-      'npm i --save-dev @jnxplus/nx-micronaut-gradle',
-      execSyncOptions()
-    );
+    execSync('npm i --save-dev @jnxplus/nx-gradle', execSyncOptions());
 
     execSync(
-      'npx nx generate @jnxplus/nx-micronaut-gradle:init',
+      'npx nx generate @jnxplus/nx-gradle:init --preset micronaut',
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-gradle:application ${testApp}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp} --framework micronaut`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-gradle:lib ${testLib} --projects ${testApp}`,
+      `npx nx g @jnxplus/nx-gradle:lib ${testLib} --framework micronaut --projects ${testApp}`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-gradle:application ${testApp2}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp2} --framework micronaut`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-gradle:application ${testApp3}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp3} --framework micronaut`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-gradle:application ${testApp4}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp4} --framework micronaut`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-gradle:lib ${testLib2} --projects ${testApp2},${testApp3},${testApp4}`,
+      `npx nx g @jnxplus/nx-gradle:lib ${testLib2} --framework micronaut --projects ${testApp2},${testApp3},${testApp4}`,
       execSyncOptions()
     );
 

diff --git a/testing-projects/smoke/nx-micronaut-maven-smoke/tests/nx-micronaut-maven.spec.ts b/testing-projects/smoke/nx-micronaut-maven-smoke/tests/nx-micronaut-maven.spec.ts
@@ -29,7 +29,7 @@ const testLib2 = uniq('test-lib2');
 const testApp3 = uniq('test-app3');
 const testApp4 = uniq('test-app4');
 
-describe('@jnxplus/nx-micronaut-maven smoke', () => {
+describe('@jnxplus/nx-maven micronaut smoke', () => {
   beforeEach(async () => {
     ({ name: smokeDirectory, removeCallback: cleanup } = dirSync({
       unsafeCleanup: true,
@@ -52,40 +52,40 @@ describe('@jnxplus/nx-micronaut-maven smoke', () => {
 
     execSync('git init', execSyncOptions());
 
-    execSync('npm i --save-dev @jnxplus/nx-micronaut-maven', execSyncOptions());
+    execSync('npm i --save-dev @jnxplus/nx-maven', execSyncOptions());
 
     execSync(
-      'npx nx generate @jnxplus/nx-micronaut-maven:init',
+      'npx nx generate @jnxplus/nx-maven:init --dependencyManagement micronaut-parent-pom',
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-maven:application ${testApp}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp} --framework micronaut`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-maven:lib ${testLib} --projects ${testApp}`,
+      `npx nx g @jnxplus/nx-maven:lib ${testLib} --framework micronaut --projects ${testApp}`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-maven:application ${testApp2}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp2} --framework micronaut`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-maven:application ${testApp3}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp3} --framework micronaut`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-maven:application ${testApp4}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp4} --framework micronaut`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-micronaut-maven:lib ${testLib2} --projects ${testApp2},${testApp3},${testApp4}`,
+      `npx nx g @jnxplus/nx-maven:lib ${testLib2} --framework micronaut --projects ${testApp2},${testApp3},${testApp4}`,
       execSyncOptions()
     );
 

diff --git a/testing-projects/smoke/nx-quarkus-gradle-smoke/project.json b/testing-projects/smoke/nx-quarkus-gradle-smoke/project.json
@@ -12,5 +12,5 @@
     }
   },
   "tags": [],
-  "implicitDependencies": ["nx-quarkus-gradle"]
+  "implicitDependencies": ["nx-gradle"]
 }
diff --git a/testing-projects/smoke/nx-quarkus-gradle-smoke/tests/nx-quarkus-gradle.spec.ts b/testing-projects/smoke/nx-quarkus-gradle-smoke/tests/nx-quarkus-gradle.spec.ts
@@ -29,7 +29,7 @@ const testLib2 = uniq('test-lib2');
 const testApp3 = uniq('test-app3');
 const testApp4 = uniq('test-app4');
 
-describe('@jnxplus/nx-quarkus-gradle smoke', () => {
+describe('@jnxplus/nx-gradle quarkus smoke', () => {
   beforeEach(async () => {
     ({ name: smokeDirectory, removeCallback: cleanup } = dirSync({
       unsafeCleanup: true,
@@ -52,40 +52,40 @@ describe('@jnxplus/nx-quarkus-gradle smoke', () => {
 
     execSync('git init', execSyncOptions());
 
-    execSync('npm i --save-dev @jnxplus/nx-quarkus-gradle', execSyncOptions());
+    execSync('npm i --save-dev @jnxplus/nx-gradle', execSyncOptions());
 
     execSync(
-      'npx nx generate @jnxplus/nx-quarkus-gradle:init',
+      'npx nx generate @jnxplus/nx-gradle:init --preset quarkus',
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-gradle:application ${testApp}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp} --framework quarkus`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-gradle:lib ${testLib} --projects ${testApp}`,
+      `npx nx g @jnxplus/nx-gradle:lib ${testLib} --framework quarkus --projects ${testApp}`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-gradle:application ${testApp2}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp2} --framework quarkus`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-gradle:application ${testApp3}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp3} --framework quarkus`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-gradle:application ${testApp4}`,
+      `npx nx g @jnxplus/nx-gradle:application ${testApp4} --framework quarkus`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-gradle:lib ${testLib2} --projects ${testApp2},${testApp3},${testApp4}`,
+      `npx nx g @jnxplus/nx-gradle:lib ${testLib2} --framework quarkus --projects ${testApp2},${testApp3},${testApp4}`,
       execSyncOptions()
     );
 

diff --git a/testing-projects/smoke/nx-quarkus-maven-smoke/project.json b/testing-projects/smoke/nx-quarkus-maven-smoke/project.json
@@ -12,5 +12,5 @@
     }
   },
   "tags": [],
-  "implicitDependencies": ["nx-quarkus-maven"]
+  "implicitDependencies": ["nx-maven"]
 }
diff --git a/testing-projects/smoke/nx-quarkus-maven-smoke/tests/nx-quarkus-maven.spec.ts b/testing-projects/smoke/nx-quarkus-maven-smoke/tests/nx-quarkus-maven.spec.ts
@@ -21,6 +21,9 @@ const execSyncOptions: () => ExecSyncOptions = () => ({
   stdio: 'inherit',
 });
 
+const libsParentProject = uniq('libs-parent-project-');
+const appsParentProject = uniq('apps-parent-project-');
+
 const testApp = uniq('test-app');
 const testLib = uniq('test-lib');
 
@@ -29,7 +32,7 @@ const testLib2 = uniq('test-lib2');
 const testApp3 = uniq('test-app3');
 const testApp4 = uniq('test-app4');
 
-describe('@jnxplus/nx-quarkus-maven smoke', () => {
+describe('@jnxplus/nx-maven quarkus smoke', () => {
   beforeEach(async () => {
     ({ name: smokeDirectory, removeCallback: cleanup } = dirSync({
       unsafeCleanup: true,
@@ -52,40 +55,47 @@ describe('@jnxplus/nx-quarkus-maven smoke', () => {
 
     execSync('git init', execSyncOptions());
 
-    execSync('npm i --save-dev @jnxplus/nx-quarkus-maven', execSyncOptions());
+    execSync('npm i --save-dev @jnxplus/nx-maven', execSyncOptions());
+
+    execSync('npx nx generate @jnxplus/nx-maven:init', execSyncOptions());
+
+    execSync(
+      `npx nx generate @jnxplus/nx-maven:parent-project ${libsParentProject} --projectType library --framework quarkus`,
+      execSyncOptions()
+    );
 
     execSync(
-      'npx nx generate @jnxplus/nx-quarkus-maven:init',
+      `npx nx generate @jnxplus/nx-maven:parent-project ${appsParentProject} --parentProject ${libsParentProject} --framework none`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-maven:application ${testApp}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp} --framework quarkus --parentProject ${appsParentProject}`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-maven:lib ${testLib} --projects ${testApp}`,
+      `npx nx g @jnxplus/nx-maven:lib ${testLib} --framework quarkus --parentProject ${libsParentProject} --projects ${testApp}`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-maven:application ${testApp2}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp2} --framework quarkus --parentProject ${appsParentProject}`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-maven:application ${testApp3}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp3} --framework quarkus --parentProject ${appsParentProject}`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-maven:application ${testApp4}`,
+      `npx nx g @jnxplus/nx-maven:application ${testApp4} --framework quarkus --parentProject ${appsParentProject}`,
       execSyncOptions()
     );
 
     execSync(
-      `npx nx g @jnxplus/nx-quarkus-maven:lib ${testLib2} --projects ${testApp2},${testApp3},${testApp4}`,
+      `npx nx g @jnxplus/nx-maven:lib ${testLib2} --framework quarkus --parentProject ${libsParentProject} --projects ${testApp2},${testApp3},${testApp4}`,
       execSyncOptions()
     );