Merge pull request jhipster#26135 from mshima/helpers

simplify jdl test without external fixture
OmarHawk · May 15, 2024 · bfcd481 · bfcd481
2 parents ea8656a + 0d43c78
commit bfcd481
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 56 deletions.
diff --git a/jdl/__test-files__/json_to_jdl_converter/only_app/.yo-rc.json b/jdl/__test-files__/json_to_jdl_converter/only_app/.yo-rc.json
diff --git a/jdl/converters/json-to-jdl-converter.spec.ts b/jdl/converters/json-to-jdl-converter.spec.ts
@@ -18,13 +18,13 @@
  */
 /* eslint-disable no-unused-expressions */
 
-import fs from 'fs';
+import fs, { readFileSync } from 'fs';
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { it, describe, expect as jestExpect, beforeEach } from 'esmocha';
 import { expect } from 'chai';
 import { convertToJDL, convertSingleContentToJDL } from '../converters/json-to-jdl-converter.js';
-import { basicHelpers as helpers } from '../../testing/index.js';
+import { createJHipsterConfigFiles, basicHelpers as helpers } from '../../testing/index.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -36,16 +36,48 @@ describe('jdl - JSONToJDLConverter', () => {
 
   describe('convertToJDL', () => {
     describe('when there is a yo-rc file in the passed directory', () => {
-      let dir;
-      let jdlFilename;
       let jdlFileContent;
 
       describe('without entities', () => {
-        beforeEach(() => {
-          dir = path.join(__dirname, '..', '__test-files__', 'json_to_jdl_converter', 'only_app');
-          jdlFilename = 'app.jdl';
-          convertToJDL(dir);
-          jdlFileContent = fs.readFileSync(path.join(dir, jdlFilename), 'utf-8');
+        beforeEach(async () => {
+          await helpers
+            .prepareTemporaryDir()
+            .withFiles(
+              createJHipsterConfigFiles({
+                jhipsterVersion: '6.0.1',
+                applicationType: 'microservice',
+                baseName: 'truc',
+                blueprints: [{ name: 'generator-jhipster-vuejs' }, { name: 'generator-jhipster-dotnetcore' }],
+                packageName: 'com.mycompany.myapp',
+                packageFolder: 'com/mycompany/myapp',
+                serverPort: '8081',
+                authenticationType: 'jwt',
+                cacheProvider: 'hazelcast',
+                enableHibernateCache: true,
+                websocket: 'no',
+                databaseType: 'sql',
+                devDatabaseType: 'h2Disk',
+                prodDatabaseType: 'mysql',
+                searchEngine: 'no',
+                messageBroker: 'no',
+                serviceDiscoveryType: 'eureka',
+                buildTool: 'maven',
+                enableSwaggerCodegen: false,
+                jwtSecretKey: 'HIDDEN',
+                testFrameworks: [],
+                jhiPrefix: 'jhi',
+                entitySuffix: '',
+                dtoSuffix: 'DTO',
+                enableTranslation: false,
+                clientPackageManager: 'npm',
+                skipClient: true,
+                nativeLanguage: 'en',
+                skipUserManagement: true,
+              }),
+            )
+            .commitFiles();
+          convertToJDL();
+          jdlFileContent = fs.readFileSync('app.jdl', 'utf-8');
         });
 
         it('should write a JDL file with the application', () => {
@@ -87,10 +119,9 @@ describe('jdl - JSONToJDLConverter', () => {
       });
       describe('with entities', () => {
         beforeEach(() => {
-          dir = path.join(__dirname, '..', '__test-files__', 'json_to_jdl_converter', 'app_with_entities');
-          jdlFilename = 'app.jdl';
+          const dir = path.join(__dirname, '..', '__test-files__', 'json_to_jdl_converter', 'app_with_entities');
           convertToJDL(dir);
-          jdlFileContent = fs.readFileSync(path.join(dir, jdlFilename), 'utf-8');
+          jdlFileContent = fs.readFileSync(path.join(dir, 'app.jdl'), 'utf-8');
         });
 
         it('should export apps & entities', () => {
@@ -334,17 +365,26 @@ describe('jdl - JSONToJDLConverter', () => {
       });
     });
     describe('when passing an output file', () => {
-      let dir;
-      let output;
+      let file;
 
-      beforeEach(() => {
-        dir = path.join(__dirname, '..', '__test-files__', 'json_to_jdl_converter', 'only_app');
-        output = path.resolve('exported.jdl');
-        convertToJDL(dir, output);
+      beforeEach(async () => {
+        file = 'exported.jdl';
+        await helpers
+          .prepareTemporaryDir()
+          .withFiles(createJHipsterConfigFiles({ baseName: 'jhipster' }))
+          .commitFiles();
+        convertToJDL('.', file);
       });
 
       it('should output it to the output file', () => {
-        expect(fs.readFileSync(output, 'utf-8')).not.to.be.null;
+        jestExpect(readFileSync(file, 'utf-8')).toMatchInlineSnapshot(`
+"application {
+  config {
+    baseName jhipster
+  }
+}
+"
+`);
       });
     });
   });

diff --git a/testing/helpers.ts b/testing/helpers.ts
@@ -14,8 +14,9 @@ import { createJHipsterLogger, normalizePathEnd, parseCreationTimestamp } from '
 import BaseGenerator from '../generators/base/index.js';
 import type { JHipsterGeneratorOptions } from '../generators/base/api.js';
 import { getPackageRoot, isDistFolder } from '../lib/index.js';
+import type { JSONEntity } from '../jdl/converters/types.js';
 
-type BaseEntity = any;
+type BaseEntity = { name: string } & JSONEntity;
 type GeneratorTestType = YeomanGenerator<JHipsterGeneratorOptions>;
 type GeneratorTestOptions = JHipsterGeneratorOptions;
 
@@ -80,6 +81,9 @@ const createFiles = (workspaceFolder: string, configuration: Record<string, unkn
   };
 };
 
+export const createJHipsterConfigFiles = (configuration: Record<string, unknown>, entities?: BaseEntity[]) =>
+  createFiles('', configuration, entities);
+
 export type FakeBlueprintOptions = {
   packageJson?: any;
   generator?: string | string[];