diff --git a/packages/angular/ssr/test/app-engine_spec.ts b/packages/angular/ssr/test/app-engine_spec.ts index df405703a5bf..ebe98d3e7d9e 100644 --- a/packages/angular/ssr/test/app-engine_spec.ts +++ b/packages/angular/ssr/test/app-engine_spec.ts @@ -19,21 +19,21 @@ import { RenderMode } from '../src/routes/route-config'; import { setAngularAppTestingManifest } from './testing-utils'; function createEntryPoint(locale: string) { - return async () => { - @Component({ - standalone: true, - selector: `app-ssr-${locale}`, - template: `SSR works ${locale.toUpperCase()}`, - }) - class SSRComponent {} - - @Component({ - standalone: true, - selector: `app-ssg-${locale}`, - template: `SSG works ${locale.toUpperCase()}`, - }) - class SSGComponent {} + @Component({ + standalone: true, + selector: `app-ssr-${locale}`, + template: `SSR works ${locale.toUpperCase()}`, + }) + class SSRComponent {} + + @Component({ + standalone: true, + selector: `app-ssg-${locale}`, + template: `SSG works ${locale.toUpperCase()}`, + }) + class SSGComponent {} + return async () => { setAngularAppTestingManifest( [ { path: 'ssg', component: SSGComponent }, @@ -74,8 +74,6 @@ describe('AngularAppEngine', () => { describe('Localized app', () => { beforeAll(() => { - destroyAngularServerApp(); - setAngularAppEngineManifest({ // Note: Although we are testing only one locale, we need to configure two or more // to ensure that we test a different code path. @@ -142,18 +140,16 @@ describe('AngularAppEngine', () => { describe('Non-localized app', () => { beforeAll(() => { - destroyAngularServerApp(); + @Component({ + standalone: true, + selector: 'app-home', + template: `Home works`, + }) + class HomeComponent {} setAngularAppEngineManifest({ entryPoints: { '': async () => { - @Component({ - standalone: true, - selector: 'app-home', - template: `Home works`, - }) - class HomeComponent {} - setAngularAppTestingManifest( [{ path: 'home', component: HomeComponent }], [{ path: '**', renderMode: RenderMode.Server }], diff --git a/packages/angular/ssr/test/app_spec.ts b/packages/angular/ssr/test/app_spec.ts index 7bf8731e17b3..1ae6d2e3e20b 100644 --- a/packages/angular/ssr/test/app_spec.ts +++ b/packages/angular/ssr/test/app_spec.ts @@ -12,7 +12,7 @@ import '@angular/compiler'; /* eslint-enable import/no-unassigned-import */ import { Component } from '@angular/core'; -import { AngularServerApp, destroyAngularServerApp } from '../src/app'; +import { AngularServerApp } from '../src/app'; import { RenderMode } from '../src/routes/route-config'; import { setAngularAppTestingManifest } from './testing-utils'; @@ -20,8 +20,6 @@ describe('AngularServerApp', () => { let app: AngularServerApp; beforeAll(() => { - destroyAngularServerApp(); - @Component({ standalone: true, selector: 'app-home', diff --git a/packages/angular/ssr/test/testing-utils.ts b/packages/angular/ssr/test/testing-utils.ts index ff6803df58a8..019e79e1b015 100644 --- a/packages/angular/ssr/test/testing-utils.ts +++ b/packages/angular/ssr/test/testing-utils.ts @@ -10,6 +10,7 @@ import { Component, provideExperimentalZonelessChangeDetection } from '@angular/ import { bootstrapApplication } from '@angular/platform-browser'; import { provideServerRendering } from '@angular/platform-server'; import { RouterOutlet, Routes, provideRouter } from '@angular/router'; +import { destroyAngularServerApp } from '../src/app'; import { ServerAsset, setAngularAppManifest } from '../src/manifest'; import { ServerRoute, provideServerRoutesConfig } from '../src/routes/route-config'; @@ -29,6 +30,16 @@ export function setAngularAppTestingManifest( baseHref = '/', additionalServerAssets: Record = {}, ): void { + destroyAngularServerApp(); + + @Component({ + standalone: true, + selector: 'app-root', + template: '', + imports: [RouterOutlet], + }) + class AppComponent {} + setAngularAppManifest({ inlineCriticalCss: false, baseHref, @@ -65,14 +76,6 @@ export function setAngularAppTestingManifest( }, }, bootstrap: async () => () => { - @Component({ - standalone: true, - selector: 'app-root', - template: '', - imports: [RouterOutlet], - }) - class AppComponent {} - return bootstrapApplication(AppComponent, { providers: [ provideServerRendering(),