Merge pull request #27358 from mshima/test-setup

generate-blueprint: drop vitest.test-setup.ts
jhipster · Sep 23, 2024 · 065560f · 065560f
2 parents d49bf40 + 665c13b
commit 065560f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 15 deletions.
diff --git a/generators/generate-blueprint/__snapshots__/generator.spec.ts.snap b/generators/generate-blueprint/__snapshots__/generator.spec.ts.snap
@@ -860,9 +860,6 @@ exports[`generator - generate-blueprint with all option should match snapshot 1`
   "vitest.config.ts": {
     "stateCleared": "modified",
   },
-  "vitest.test-setup.ts": {
-    "stateCleared": "modified",
-  },
 }
 `;
 
@@ -904,8 +901,5 @@ exports[`generator - generate-blueprint with default config should write files a
   "vitest.config.ts": {
     "stateCleared": "modified",
   },
-  "vitest.test-setup.ts": {
-    "stateCleared": "modified",
-  },
 }
 `;
diff --git a/generators/generate-blueprint/files.ts b/generators/generate-blueprint/files.ts
@@ -30,7 +30,6 @@ export const files = asWriteFilesSection<any>({
         'README.md',
         'tsconfig.json',
         'vitest.config.ts',
-        'vitest.test-setup.ts',
         '.blueprint/cli/commands.mjs',
         '.blueprint/generate-sample/command.mjs',
         '.blueprint/generate-sample/generator.mjs',

diff --git a/generators/generate-blueprint/generator.ts b/generators/generate-blueprint/generator.ts
@@ -203,7 +203,10 @@ export default class extends BaseGenerator {
   get writing() {
     return this.asWritingTaskGroup({
       async cleanup({ control }) {
-        await control.cleanupFiles({ '8.5.1': ['.eslintrc.json'] });
+        await control.cleanupFiles({
+          '8.5.1': ['.eslintrc.json'],
+          '8.7.2': ['vitest.test-setup.ts'],
+        });
       },
       async writing() {
         this.application.sampleWritten = this.jhipsterConfig.sampleWritten;

diff --git a/generators/generate-blueprint/templates/vitest.config.ts.ejs b/generators/generate-blueprint/templates/vitest.config.ts.ejs
@@ -5,6 +5,5 @@ export default defineConfig({
     pool: 'forks',
     hookTimeout: 20000,
     exclude: [...defaultExclude.filter(val => val !== '**/cypress/**'), '**/templates/**', '**/resources/**'],
-    setupFiles: ['./vitest.test-setup.ts'],
   },
 });
diff --git a/generators/generate-blueprint/templates/vitest.test-setup.ts.ejs b/generators/generate-blueprint/templates/vitest.test-setup.ts.ejs