From 665c13b85c57eb2a6fa7bf964d80d23f0b507c88 Mon Sep 17 00:00:00 2001
From: Marcelo Shima <marceloshima@gmail.com>
Date: Sun, 22 Sep 2024 09:49:37 -0300
Subject: [PATCH] generate-blueprint: drop vitest.test-setup.ts

---
 .../generate-blueprint/__snapshots__/generator.spec.ts.snap | 6 ------
 generators/generate-blueprint/files.ts                      | 1 -
 generators/generate-blueprint/generator.ts                  | 5 ++++-
 .../generate-blueprint/templates/vitest.config.ts.ejs       | 1 -
 .../generate-blueprint/templates/vitest.test-setup.ts.ejs   | 6 ------
 5 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 generators/generate-blueprint/templates/vitest.test-setup.ts.ejs

diff --git a/generators/generate-blueprint/__snapshots__/generator.spec.ts.snap b/generators/generate-blueprint/__snapshots__/generator.spec.ts.snap
index 04c95f53a9ea..e67175312ead 100644
--- 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
index 52f2e5c0f71d..2ca15fecd19c 100644
--- 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
index 59dd31e633d0..f183f3ff6b45 100644
--- 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
index d1fa83cf8397..d46556a90a3b 100644
--- 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
deleted file mode 100644
index b94ccb061ea0..000000000000
--- a/generators/generate-blueprint/templates/vitest.test-setup.ts.ejs
+++ /dev/null
@@ -1,6 +0,0 @@
-import { vi } from 'vitest';
-import { defineDefaults } from 'generator-jhipster/testing';
-
-defineDefaults({
-  mockFactory: () => vi.fn(),
-});