Jdl blueprint fix 25385 (#25386)

* add inline jdl content to blueprint spec option fixes #25385 * add jdl subgenerator to blueprints ci-cd
jhipster · Mar 1, 2024 · 05ba864 · 05ba864
1 parent 0d5b1c4
commit 05ba864
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs b/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs
@@ -37,6 +37,9 @@ describe('SubGenerator <%= subGenerator %> of <%= application.baseName %> JHipst
           ignoreNeedlesError: true,
 <%_ if (!customGenerator) { _%>
           blueprint: '<%= application.baseName %>',
+<%_ } _%>
+<%_ if (subGenerator === 'jdl') { _%>
+          inline: 'application { }',
 <%_ } _%>
         })
         .withJHipsterLookup()

diff --git a/test-integration/generate-blueprint-samples/default/.yo-rc.json b/test-integration/generate-blueprint-samples/default/.yo-rc.json
@@ -100,12 +100,40 @@
         ],
         "sbs": false,
         "written": true
+      },
+      "jdl": {
+        "command": true,
+        "priorities": [
+          "initializing",
+          "prompting",
+          "configuring",
+          "composing",
+          "loading",
+          "preparing",
+          "configuringEachEntity",
+          "loadingEntities",
+          "preparingEachEntity",
+          "preparingEachEntityField",
+          "preparingEachEntityRelationship",
+          "postPreparingEachEntity",
+          "default",
+          "writing",
+          "writingEntities",
+          "postWriting",
+          "postWritingEntities",
+          "loadingTranslations",
+          "install",
+          "postInstall",
+          "end"
+        ],
+        "sbs": false,
+        "written": true
       }
     },
     "jhipsterVersion": "7.5.0",
     "mainGenerator": "generate-blueprint",
     "prettierDefaultIndent": 2,
     "projectName": "CiTest",
-    "subGenerators": ["client", "common", "cypress", "server"]
+    "subGenerators": ["client", "common", "cypress", "server", "jdl"]
   }
 }