Revert "build: Run browsers tests without platform-browser-dynamic (#60937)" (#61059)

thePunderWoman · crisbeto · commit 867f389a9860 · 2025-04-30T12:21:01.000+02:00
This reverts commit b896ca8. PR Close #61059
diff --git a/packages/animations/test/browser_animation_builder_spec.ts b/packages/animations/test/browser_animation_builder_spec.ts
@@ -17,9 +17,12 @@ import {DOCUMENT} from '@angular/common';
 import {Component, NgZone, RendererFactory2, ViewChild} from '@angular/core';
 import {fakeAsync, flushMicrotasks, TestBed} from '@angular/core/testing';
 import {ɵDomRendererFactory2 as DomRendererFactory2} from '@angular/platform-browser';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {ɵAsyncAnimationRendererFactory as AsyncAnimationRendererFactory} from '@angular/platform-browser/animations/async';
-import {BrowserTestingModule, platformBrowserTesting} from '@angular/platform-browser/testing';
 
 describe('BrowserAnimationBuilder', () => {
   if (isNode) {
@@ -233,7 +236,7 @@ describe('BrowserAnimationBuilder', () => {
       // We need to reset the test environment because
       // browser_tests.init.ts inits the environment with the NoopAnimationsModule
       TestBed.resetTestEnvironment();
-      TestBed.initTestEnvironment([BrowserTestingModule], platformBrowserTesting());
+      TestBed.initTestEnvironment([BrowserDynamicTestingModule], platformBrowserDynamicTesting());
     });
 
     it('should throw an error when injecting AnimationBuilder without animation providers set', () => {
@@ -246,8 +249,8 @@ describe('BrowserAnimationBuilder', () => {
       // We're reset the test environment to their default values, cf browser_tests.init.ts
       TestBed.resetTestEnvironment();
       TestBed.initTestEnvironment(
-        [BrowserTestingModule, NoopAnimationsModule],
-        platformBrowserTesting(),
+        [BrowserDynamicTestingModule, NoopAnimationsModule],
+        platformBrowserDynamicTesting(),
       );
     });
   });
diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
@@ -75,7 +75,7 @@ ts_library(
         "//packages/core/testing",
         "//packages/localize/init",
         "//packages/platform-browser",
-        "//packages/platform-browser-dynamic/testing",
+        "//packages/platform-browser-dynamic",
         "//packages/platform-browser/animations",
         "//packages/platform-browser/testing",
         "//packages/platform-server",
diff --git a/packages/core/test/application_ref_spec.ts b/packages/core/test/application_ref_spec.ts
@@ -15,13 +15,15 @@ import {
   Compiler,
   CompilerFactory,
   Component,
+  effect,
   EnvironmentInjector,
   InjectionToken,
   Injector,
   LOCALE_ID,
   NgModule,
   NgZone,
   PlatformRef,
+  ProviderToken,
   provideZoneChangeDetection,
   RendererFactory2,
   TemplateRef,
@@ -46,7 +48,6 @@ import {ApplicationRef} from '../src/application/application_ref';
 import {NoopNgZone} from '../src/zone/ng_zone';
 import {ComponentFixtureNoNgZone, inject, TestBed, waitForAsync, withModule} from '../testing';
 import {take} from 'rxjs/operators';
-import {compileNgModuleFactory} from '../src/application/application_ngmodule_factory_compiler';
 
 let serverPlatformModule: Promise<Type<ServerModule>> | null = null;
 if (isNode) {
@@ -676,38 +677,45 @@ describe('bootstrap', () => {
         initializerDone = true;
       }, 1);
 
-      const moduleType = await createModule([
-        {provide: APP_INITIALIZER, useValue: () => promise, multi: true},
-      ]);
-      const moduleFactory = await compileNgModuleFactory(defaultPlatform.injector, {}, moduleType);
-
+      const compilerFactory: CompilerFactory = defaultPlatform.injector.get(CompilerFactory, null)!;
+      const moduleFactory = compilerFactory
+        .createCompiler()
+        .compileModuleSync(
+          await createModule([{provide: APP_INITIALIZER, useValue: () => promise, multi: true}]),
+        );
       defaultPlatform.bootstrapModuleFactory(moduleFactory).then((_) => {
         expect(initializerDone).toBe(true);
       });
     }));
 
     it('should rethrow sync errors even if the exceptionHandler is not rethrowing', waitForAsync(async () => {
-      const moduleType = await createModule([
-        {
-          provide: APP_INITIALIZER,
-          useValue: () => {
-            throw 'Test';
+      const compilerFactory: CompilerFactory = defaultPlatform.injector.get(CompilerFactory, null)!;
+      const moduleFactory = compilerFactory.createCompiler().compileModuleSync(
+        await createModule([
+          {
+            provide: APP_INITIALIZER,
+            useValue: () => {
+              throw 'Test';
+            },
+            multi: true,
           },
-          multi: true,
-        },
-      ]);
-      const moduleFactory = await compileNgModuleFactory(defaultPlatform.injector, {}, moduleType);
+        ]),
+      );
       expect(() => defaultPlatform.bootstrapModuleFactory(moduleFactory)).toThrow('Test');
       // Error rethrown will be seen by the exception handler since it's after
       // construction.
       expect(mockConsole.res[0].join('#')).toEqual('ERROR#Test');
     }));
 
     it('should rethrow promise errors even if the exceptionHandler is not rethrowing', waitForAsync(async () => {
-      const moduleType = await createModule([
-        {provide: APP_INITIALIZER, useValue: () => Promise.reject('Test'), multi: true},
-      ]);
-      const moduleFactory = await compileNgModuleFactory(defaultPlatform.injector, {}, moduleType);
+      const compilerFactory: CompilerFactory = defaultPlatform.injector.get(CompilerFactory, null)!;
+      const moduleFactory = compilerFactory
+        .createCompiler()
+        .compileModuleSync(
+          await createModule([
+            {provide: APP_INITIALIZER, useValue: () => Promise.reject('Test'), multi: true},
+          ]),
+        );
       defaultPlatform.bootstrapModuleFactory(moduleFactory).then(
         () => expect(false).toBe(true),
         (e) => {
diff --git a/packages/core/test/linker/regression_integration_spec.ts b/packages/core/test/linker/regression_integration_spec.ts
@@ -36,7 +36,8 @@ import {
   ViewContainerRef,
 } from '../../src/core';
 import {fakeAsync, inject, TestBed, tick} from '../../testing';
-import {BrowserModule, By, platformBrowser} from '@angular/platform-browser';
+import {BrowserModule, By} from '@angular/platform-browser';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
 describe('regressions', () => {
@@ -484,7 +485,7 @@ describe('regressions using bootstrap', () => {
       })
       class TestModule {}
 
-      platformBrowser()
+      platformBrowserDynamic()
         .bootstrapModule(TestModule)
         .then((ref) => {
           NgZone.assertNotInAngularZone();
diff --git a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts
@@ -7,11 +7,9 @@
  */
 
 import {ResourceLoader} from '@angular/compiler';
-import {Compiler, Component, getPlatform, NgModule, PlatformRef} from '@angular/core';
+import {Compiler, Component, NgModule} from '@angular/core';
 import {fakeAsync, inject, TestBed, tick, waitForAsync} from '@angular/core/testing';
 import {ResourceLoaderImpl} from '../src/resource_loader/resource_loader_impl';
-import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '../testing';
-import {BrowserTestingModule, platformBrowserTesting} from '@angular/platform-browser/testing';
 
 // Components for the tests.
 class FancyService {
@@ -56,15 +54,6 @@ if (isBrowser) {
     describe('using the test injector with the inject helper', () => {
       describe('setting up Providers', () => {
         beforeEach(() => {
-          getPlatform()?.destroy();
-          // We need to reset the test environment because
-          // browser_tests.init.ts doesn't use platformBrowserDynamicTesting
-          TestBed.resetTestEnvironment();
-          TestBed.initTestEnvironment(
-            [BrowserDynamicTestingModule],
-            platformBrowserDynamicTesting(),
-          );
-
           TestBed.configureTestingModule({
             providers: [{provide: FancyService, useValue: new FancyService()}],
           });
@@ -87,14 +76,6 @@ if (isBrowser) {
             expect(value).toEqual('async value');
           }),
         ));
-
-        afterEach(() => {
-          getPlatform()?.destroy();
-
-          // We're reset the test environment to their default values, cf browser_tests.init.ts
-          TestBed.resetTestEnvironment();
-          TestBed.initTestEnvironment([BrowserTestingModule], platformBrowserTesting());
-        });
       });
     });
 
diff --git a/tools/testing/BUILD.bazel b/tools/testing/BUILD.bazel
@@ -20,8 +20,8 @@ ts_library(
         ":zone_base_setup_lib",
         "//packages/compiler",
         "//packages/core/testing",
+        "//packages/platform-browser-dynamic/testing",
         "//packages/platform-browser/animations",
-        "//packages/platform-browser/testing",
         "//packages/zone.js/lib",
     ],
 )
diff --git a/tools/testing/browser_tests.init.ts b/tools/testing/browser_tests.init.ts
@@ -11,10 +11,16 @@ import './zone_base_setup';
 import '@angular/compiler'; // For JIT mode. Must be in front of any other @angular/* imports.
 
 import {TestBed} from '@angular/core/testing';
-import {BrowserTestingModule, platformBrowserTesting} from '@angular/platform-browser/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 
-TestBed.initTestEnvironment([BrowserTestingModule, NoopAnimationsModule], platformBrowserTesting());
+TestBed.initTestEnvironment(
+  [BrowserDynamicTestingModule, NoopAnimationsModule],
+  platformBrowserDynamicTesting(),
+);
 
 (window as any).isNode = false;
 (window as any).isBrowser = true;
