generator-jhipster 9.1.0 → 9.2.0

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.ts.ejs

@@ -20,7 +20,6 @@ import { Component, ChangeDetectionStrategy, input } from '@angular/core';
 import { KeyValuePipe, DecimalPipe } from '@angular/common';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { NgbProgressbar } from '@ng-bootstrap/ng-bootstrap/progressbar';
@@ -30,7 +29,7 @@ import { JvmMetrics } from 'app/admin/metrics/metrics.model';
   selector: '<%- jhiPrefixDashed %>-jvm-memory',
   changeDetection: ChangeDetectionStrategy.OnPush,
   templateUrl: './jvm-memory.html',
-  imports: [NgbProgressbar, KeyValuePipe, DecimalPipe<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [NgbProgressbar, KeyValuePipe, DecimalPipe<%- enableTranslation ? ', TranslateDirective' : '' %>],
 })
 export class JvmMemory {
   /**

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.ts.ejs

@@ -21,7 +21,6 @@ import { DecimalPipe } from '@angular/common';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap/modal';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { NgbProgressbar } from '@ng-bootstrap/ng-bootstrap/progressbar';
@@ -32,7 +31,7 @@ import { MetricsModalThreads } from '../metrics-modal-threads/metrics-modal-thre
   selector: '<%- jhiPrefixDashed %>-jvm-threads',
   changeDetection: ChangeDetectionStrategy.OnPush,
   templateUrl: './jvm-threads.html',
-  imports: [NgbProgressbar, DecimalPipe<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [NgbProgressbar, DecimalPipe<%- enableTranslation ? ', TranslateDirective' : '' %>],
 })
 export class JvmThreads {
   readonly threads = input<Thread[] | undefined>();

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.ts.ejs

@@ -20,7 +20,6 @@ import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { KeyValuePipe, DecimalPipe } from '@angular/common';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { CacheMetrics } from 'app/admin/metrics/metrics.model';
@@ -30,7 +29,7 @@ import { filterNaN } from 'app/core/util/operators';
   selector: '<%- jhiPrefixDashed %>-metrics-cache',
   templateUrl: './metrics-cache.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [KeyValuePipe, DecimalPipe<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [KeyValuePipe, DecimalPipe<%- enableTranslation ? ', TranslateDirective' : '' %>],
 })
 export class MetricsCache {
   /**

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.ts.ejs

@@ -20,7 +20,6 @@ import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { DecimalPipe } from '@angular/common';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { Databases } from 'app/admin/metrics/metrics.model';
@@ -30,7 +29,7 @@ import { filterNaN } from 'app/core/util/operators';
   selector: '<%- jhiPrefixDashed %>-metrics-datasource',
   templateUrl: './metrics-datasource.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [DecimalPipe<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [DecimalPipe<%- enableTranslation ? ', TranslateDirective' : '' %>],
 })
 export class MetricsDatasource {
   /**

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.ts.ejs

@@ -20,7 +20,6 @@ import { Component, ChangeDetectionStrategy, input } from '@angular/core';
 import { DecimalPipe } from '@angular/common';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { NgbProgressbar } from '@ng-bootstrap/ng-bootstrap/progressbar';
@@ -30,7 +29,7 @@ import { GarbageCollector } from 'app/admin/metrics/metrics.model';
   selector: '<%- jhiPrefixDashed %>-metrics-garbagecollector',
   changeDetection: ChangeDetectionStrategy.OnPush,
   templateUrl: './metrics-garbagecollector.html',
-  imports: [NgbProgressbar, DecimalPipe<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [NgbProgressbar, DecimalPipe<%- enableTranslation ? ', TranslateDirective' : '' %>],
 })
 export class MetricsGarbageCollector {
   /**

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.spec.ts.ejs

@@ -16,13 +16,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap/modal';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 
 import { MetricsModalThreads } from './metrics-modal-threads';
@@ -35,10 +33,12 @@ describe('MetricsModalThreads', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
+      providers: [
 <%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-      providers: [NgbActiveModal],
+        NgbActiveModal,
+      ],
     });
   });
 
@@ -318,7 +318,7 @@ describe('MetricsModalThreads', () => {
   describe('dismiss', () => {
     it('should call dismiss function for modal on dismiss', () => {
       // GIVEN
-      <%- clientTestFramework %>.spyOn(mockActiveModal, 'dismiss');
+      vitest.spyOn(mockActiveModal, 'dismiss');
 
       // WHEN
       comp.dismiss();

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.ts.ejs

@@ -20,7 +20,6 @@ import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/cor
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap/modal';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
@@ -30,7 +29,7 @@ import { Thread, ThreadState } from 'app/admin/metrics/metrics.model';
   selector: '<%- jhiPrefixDashed %>-thread-modal',
   templateUrl: './metrics-modal-threads.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [FontAwesomeModule<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [FontAwesomeModule<%- enableTranslation ? ', TranslateDirective' : '' %>],
 })
 export class MetricsModalThreads implements OnInit {
   ThreadState = ThreadState;

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.ts.ejs

@@ -20,7 +20,6 @@ import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { KeyValuePipe, DecimalPipe } from '@angular/common';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { NgbProgressbar } from '@ng-bootstrap/ng-bootstrap/progressbar';
@@ -31,7 +30,7 @@ import { filterNaN } from 'app/core/util/operators';
   selector: '<%- jhiPrefixDashed %>-metrics-request',
   templateUrl: './metrics-request.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [NgbProgressbar, KeyValuePipe, DecimalPipe<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [NgbProgressbar, KeyValuePipe, DecimalPipe<%- enableTranslation ? ', TranslateDirective' : '' %>],
 })
 export class MetricsRequest {
   /**

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.spec.ts.ejs

@@ -16,12 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of } from 'rxjs';
 
@@ -34,14 +32,14 @@ describe('Metrics', () => {
   let fixture: ComponentFixture<Metrics>;
   let service: MetricsService;
 
+<%_ if (enableTranslation) { _%>
   beforeEach(() => {
     TestBed.configureTestingModule({
-<%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
-<%_ } _%>
+      providers: [provideTranslateService()],
     });
   });
 
+<%_ } _%>
   beforeEach(() => {
     fixture = TestBed.createComponent(Metrics);
     comp = fixture.componentInstance;
@@ -65,8 +63,8 @@ describe('Metrics', () => {
       } as unknown as MetricsModel;
       const threadDump = { threads: [{ threadName: 'thread 1' } as Thread] };
 
-      <%- clientTestFramework %>.spyOn(service, 'getMetrics').mockReturnValue(of(metrics));
-      <%- clientTestFramework %>.spyOn(service, 'threadDump').mockReturnValue(of(threadDump));
+      vitest.spyOn(service, 'getMetrics').mockReturnValue(of(metrics));
+      vitest.spyOn(service, 'threadDump').mockReturnValue(of(threadDump));
 
       // WHEN
       comp.ngOnInit();

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.ts.ejs

@@ -20,7 +20,6 @@ import { Component, OnInit, ChangeDetectionStrategy, inject, signal } from '@ang
 import { combineLatest } from 'rxjs';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
@@ -42,7 +41,6 @@ import { MetricsSystem } from './blocks/metrics-system/metrics-system';
   imports: [
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
 <%_ } _%>
     FontAwesomeModule,
     JvmMemory,

package/dist/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.ts.ejs

@@ -24,7 +24,6 @@ import { TrackerService } from 'app/core/tracker/tracker.service';
 import { TrackerActivity } from 'app/core/tracker/tracker-activity.model';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 @Component({
@@ -34,7 +33,6 @@ import { TranslateModule } from '@ngx-translate/core';
     DatePipe,
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
 <%_ } _%>
   ],
   templateUrl: './tracker.html',

package/dist/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { ApplicationConfig, LOCALE_ID, importProvidersFrom, inject } from '@angular/core';
+import { ApplicationConfig, LOCALE_ID, inject } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { Router, RouterFeatures, TitleStrategy, provideRouter, withComponentInputBinding, withDebugTracing, withNavigationErrorHandler, NavigationError } from '@angular/router';
 import { provideServiceWorker } from '@angular/service-worker';
@@ -31,7 +31,7 @@ import { NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap/datepicker';
 
 import './config/dayjs';
 <%_ if (enableTranslation) { _%>
-import { TranslationModule } from 'app/shared/language/translation.module';
+import { provideTranslation } from 'app/shared/language/translation.provider';
 <%_ } _%>
 import { environment } from 'environments/environment';
 import FindLanguageFromKeyPipe from 'app/shared/language/find-language-from-key.pipe';
@@ -60,12 +60,12 @@ if (environment.DEBUG_INFO_ENABLED) {
 
 export const appConfig: ApplicationConfig = {
   providers: [
+<%_ if (enableTranslation) { _%>
+    provideTranslation(),
+<%_ } _%>
     provideRouter(routes, ...routerFeatures),
     // Set this to true to enable service worker (PWA)
     provideServiceWorker('ngsw-worker.js', { enabled: false }),
-<%_ if (enableTranslation) { _%>
-    importProvidersFrom(TranslationModule),
-<%_ } _%>
     provideHttpClient(
       withInterceptors([
 <%_ if (authenticationTypeJwt) { _%>

package/dist/generators/angular/templates/src/main/webapp/app/app.ts.ejs

@@ -21,15 +21,11 @@ import { registerLocaleData } from '@angular/common';
 import dayjs from 'dayjs/esm';
 import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
 import { NgbDatepickerConfig } from '@ng-bootstrap/ng-bootstrap/datepicker';
-import { provideRouter } from '@angular/router';
 import locale from '@angular/common/locales/<%- angularLocaleId %>';
 import appRoutes from './app.routes';
 
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
 import { fontAwesomeIcons } from './config/font-awesome-icons';
-<%_ if (enableTranslation) { _%>
-import { TranslationModule } from 'app/shared/language/translation.module';
-<%_ } _%>
 import Main from './layouts/main/main';
 <%_ if (communicationSpringWebsocket) { _%>
 import { TrackerService } from './core/tracker/tracker.service';

package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.spec.ts.ejs

@@ -16,15 +16,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { Mock, afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
 
 <%_ if (enableTranslation) { _%>
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TranslateService, provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 
 import { Authority } from 'app/shared/jhipster/constants';
@@ -49,7 +47,7 @@ function accountWithAuthorities(authorities: string[]): Account {
   };
 }
 
-const mockFn = (value: string | null): Mock => <%- clientTestFramework %>.fn(() => value);
+const mockFn = (value: string | null): Mock => vitest.fn(() => value);
 
 describe('Account Service', () => {
   let service: AccountService;
@@ -65,18 +63,16 @@ describe('Account Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
+      providers: [
 <%_ if (enableTranslation) { _%>
-      imports: [
-        TranslateModule.forRoot(),
-      ],
+        provideTranslateService(),
 <%_ } _%>
-      providers: [
         provideHttpClientTesting(),
         {
           provide: StateStorageService,
           useValue: {
-            clearUrl: <%- clientTestFramework %>.fn(),
-            getUrl: <%- clientTestFramework %>.fn(),
+            clearUrl: vitest.fn(),
+            getUrl: vitest.fn(),
           },
         },
       ],
@@ -89,11 +85,11 @@ describe('Account Service', () => {
     httpMock = TestBed.inject(HttpTestingController);
     mockStorageService = TestBed.inject(StateStorageService);
     mockRouter = TestBed.inject(Router);
-    <%- clientTestFramework %>.spyOn(mockRouter, 'navigateByUrl');
+    vitest.spyOn(mockRouter, 'navigateByUrl');
 <%_ if (enableTranslation) { _%>
 
     mockTranslateService = TestBed.inject(TranslateService);
-    <%- clientTestFramework %>.spyOn(mockTranslateService, 'use');
+    vitest.spyOn(mockTranslateService, 'use');
 <%_ } _%>
   });
 
@@ -136,7 +132,7 @@ describe('Account Service', () => {
       service.identity().subscribe();
       // Then there is only request
       const requests = httpMock.match({ method: 'GET' });
-      expect(requests.length).toBe(1);
+      expect(requests).toHaveLength(1);
     });
 
     it('should call /account only once if not logged out after first authentication and should call /account again if user has logged out', () => {
@@ -157,7 +153,7 @@ describe('Account Service', () => {
 
       // Then there is a new request
       const requests = httpMock.match({ method: 'GET' });
-      expect(requests.length).toBe(1);
+      expect(requests).toHaveLength(1);
     });
 
 <%_ if (enableTranslation) { _%>

package/dist/generators/angular/templates/src/main/webapp/app/core/auth/auth-jwt.service.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 <%_ if (authenticationTypeJwt) { _%>
@@ -64,7 +62,7 @@ describe('Auth JWT', () => {
   describe('Login', () => {
     it('should clear session storage and save in local storage when rememberMe is true', () => {
       // GIVEN
-      mockStorageService.storeAuthenticationToken = <%- clientTestFramework %>.fn();
+      mockStorageService.storeAuthenticationToken = vitest.fn();
 
       // WHEN
       service.login({ username: 'John', password: '123', rememberMe: true }).subscribe();
@@ -77,7 +75,7 @@ describe('Auth JWT', () => {
 
     it('should clear local storage and save in session storage when rememberMe is false', () => {
       // GIVEN
-      mockStorageService.storeAuthenticationToken = <%- clientTestFramework %>.fn();
+      mockStorageService.storeAuthenticationToken = vitest.fn();
 
       // WHEN
       service.login({ username: 'John', password: '123', rememberMe: false }).subscribe();
@@ -92,7 +90,7 @@ describe('Auth JWT', () => {
   describe('Logout', () => {
     it('should clear storage', () => {
       // GIVEN
-      mockStorageService.clearAuthenticationToken = <%- clientTestFramework %>.fn();
+      mockStorageService.clearAuthenticationToken = vitest.fn();
 
       // WHEN
       service.logout().subscribe();

package/dist/generators/angular/templates/src/main/webapp/app/core/config/application-config.service.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 
 import { ApplicationConfigService } from './application-config.service';

package/dist/generators/angular/templates/src/main/webapp/app/core/microfrontend/index.ts.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 // eslint-disable @typescript-eslint/no-unsafe-return
-import { Type } from '@angular/core';
+import { EnvironmentInjector, Type } from '@angular/core';
 import { loadRemoteModule } from '@angular-architects/module-federation-runtime';
 
 import NavbarItem from 'app/layouts/navbar/navbar-item.model';
@@ -29,13 +29,6 @@ export const loadNavbarItems = async (service: string): Promise<NavbarItem[]> =>
     exposedModule: './entity-navbar-items',
   }).then(({ EntityNavbarItems }) => EntityNavbarItems);
 
-export const loadTranslationModule = async (service: string): Promise<Type<any>> =>
-  loadRemoteModule<{ LazyTranslationModule: Type<any> }>({
-    type: 'module',
-    remoteEntry: `./services/${service}/remoteEntry.js`,
-    exposedModule: './translation-module',
-  }).then(({ LazyTranslationModule }) => LazyTranslationModule);
-
 export const loadEntityRoutes = (service: string): Promise<Type<any>> =>
   loadRemoteModule<Type<any>>({
     type: 'module',

package/dist/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs

@@ -16,12 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { inject, TestBed } from '@angular/core/testing';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule, TranslateService, MissingTranslationHandler } from '@ngx-translate/core';
+import { TranslateService, MissingTranslationHandler, provideTranslateService } from '@ngx-translate/core';
 import { missingTranslationHandler } from '../../config/translation.config';
 <%_ } _%>
 
@@ -35,24 +33,24 @@ describe('Alert Service Test', () => {
 <%_ } _%>
 
   beforeEach(() => {
-    TestBed.configureTestingModule({
 <%_ if (enableTranslation) { _%>
-      imports: [
-        TranslateModule.forRoot({
+    TestBed.configureTestingModule({
+      providers: [
+        provideTranslateService({
           missingTranslationHandler: {
             provide: MissingTranslationHandler,
             useFactory: missingTranslationHandler,
           },
         }),
       ],
-<%_ } _%>
     });
+<%_ } _%>
     service = TestBed.inject(AlertService);
 <%_ if (enableTranslation) { _%>
     translateService = TestBed.inject(TranslateService);
     translateService.setFallbackLang('en');
 <%_ } _%>
-    <%- clientTestFramework %>.useFakeTimers();
+    vitest.useFakeTimers();
     extAlerts = [];
   });
 
@@ -76,7 +74,7 @@ describe('Alert Service Test', () => {
       }),
     );
 
-    expect(service.get().length).toBe(1);
+    expect(service.get()).toHaveLength(1);
     expect(service.get()[0]).toEqual(
       expect.objectContaining({
         type: 'success',
@@ -112,7 +110,7 @@ describe('Alert Service Test', () => {
         }),
       );
 
-      expect(extAlerts.length).toBe(1);
+      expect(extAlerts).toHaveLength(1);
       expect(extAlerts[0]).toEqual(
         expect.objectContaining({
           type: 'success',
@@ -136,7 +134,7 @@ describe('Alert Service Test', () => {
       }),
     );
 
-    expect(service.get().length).toBe(2);
+    expect(service.get()).toHaveLength(2);
     expect(service.get()[1]).toEqual(
       expect.objectContaining({
         type: 'success',
@@ -158,9 +156,9 @@ describe('Alert Service Test', () => {
       }),
     );
 
-    expect(service.get().length).toBe(3);
+    expect(service.get()).toHaveLength(3);
     alert1.close?.(service.get());
-    expect(service.get().length).toBe(2);
+    expect(service.get()).toHaveLength(2);
     expect(service.get()[1]).not.toEqual(
       expect.objectContaining({
         type: 'info',
@@ -169,7 +167,7 @@ describe('Alert Service Test', () => {
       }),
     );
     alert2.close?.(service.get());
-    expect(service.get().length).toBe(1);
+    expect(service.get()).toHaveLength(1);
     expect(service.get()[0]).not.toEqual(
       expect.objectContaining({
         type: 'success',
@@ -178,26 +176,26 @@ describe('Alert Service Test', () => {
       }),
     );
     alert0.close?.(service.get());
-    expect(service.get().length).toBe(0);
+    expect(service.get()).toHaveLength(0);
   });
 
   it('should close an alert on timeout correctly', () => {
     service.addAlert({ type: 'info', message: 'Hello Jhipster info' });
 
-    expect(service.get().length).toBe(1);
+    expect(service.get()).toHaveLength(1);
 
-    <%- clientTestFramework %>.advanceTimersByTime(6000);
+    vitest.advanceTimersByTime(6000);
 
-    expect(service.get().length).toBe(0);
+    expect(service.get()).toHaveLength(0);
   });
 
   it('should clear alerts', () => {
     service.addAlert({ type: 'info', message: 'Hello Jhipster info' });
     service.addAlert({ type: 'danger', message: 'Hello Jhipster info' });
     service.addAlert({ type: 'success', message: 'Hello Jhipster info' });
-    expect(service.get().length).toBe(3);
+    expect(service.get()).toHaveLength(3);
     service.clear();
-    expect(service.get().length).toBe(0);
+    expect(service.get()).toHaveLength(0);
   });
 
   it('should produce a scoped alert', () => {
@@ -223,7 +221,7 @@ describe('Alert Service Test', () => {
       }),
     );
 
-    expect(service.get().length).toBe(0);
+    expect(service.get()).toHaveLength(0);
   });
 
   it('should produce a success message', () => {

package/dist/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 
 import { DataUtils } from './data-util.service';
@@ -42,8 +40,8 @@ describe('Data Utils Service Test', () => {
   describe('openFile', () => {
     it('should open the file in the new window', () => {
       const newWindow = { ...window };
-      window.open = <%- clientTestFramework %>.fn(() => newWindow);
-      window.URL.createObjectURL = <%- clientTestFramework %>.fn();
+      window.open = vitest.fn(() => newWindow);
+      window.URL.createObjectURL = vitest.fn();
       // 'JHipster' in base64 is 'SkhpcHN0ZXI='
       const data = 'SkhpcHN0ZXI=';
       const contentType = 'text/plain';

package/dist/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 
 import { EventManager, EventWithContent } from './event-manager.service';

package/dist/generators/angular/templates/src/main/webapp/app/core/util/operators.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { filterNaN, isPresent } from './operators';
 
 describe('Operators Test', () => {

package/dist/generators/angular/templates/src/main/webapp/app/core/util/parse-links.service.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 
 import { ParseLinks } from './parse-links.service';