fix(platform-browser): ensure platformBrowserTesting includes platformBrowser providers (#60480)

alan-agius4 · alxhub · commit 70bdb88b0c99 · 2025-03-20T12:33:12.000-07:00
Previously, `platformBrowserTesting` did not include any `platformBrowser` providers, causing an inconsistency with `platformBrowserDynamicTesting`. This update resolves the issue by restructuring platform inheritance to ensure proper provider inclusion: - `platformCore → platformBrowser → platformBrowserTesting` - `platformBrowser → platformBrowserDynamic → platformBrowserDynamicTesting` Now, `platformBrowserTesting` correctly inherits from `platformBrowser`, aligning with the expected behavior. PR Close #60480
diff --git a/goldens/public-api/platform-browser-dynamic/index.api.md b/goldens/public-api/platform-browser-dynamic/index.api.md
@@ -4,10 +4,11 @@
 
 ```ts
 
-import * as _angular_core from '@angular/core';
 import { Compiler } from '@angular/core';
 import { CompilerFactory } from '@angular/core';
 import { CompilerOptions } from '@angular/core';
+import * as i0 from '@angular/core';
+import { StaticProvider } from '@angular/core';
 import { Version } from '@angular/core';
 
 // @public @deprecated (undocumented)
@@ -17,7 +18,7 @@ export class JitCompilerFactory implements CompilerFactory {
 }
 
 // @public (undocumented)
-export const platformBrowserDynamic: (extraProviders?: _angular_core.StaticProvider[]) => _angular_core.PlatformRef;
+export const platformBrowserDynamic: (extraProviders?: StaticProvider[]) => i0.PlatformRef;
 
 // @public (undocumented)
 export const VERSION: Version;
diff --git a/goldens/public-api/platform-browser-dynamic/testing/index.api.md b/goldens/public-api/platform-browser-dynamic/testing/index.api.md
@@ -4,19 +4,19 @@
 
 ```ts
 
-import * as _angular_core from '@angular/core';
+import * as i0 from '@angular/core';
 import * as i1 from '@angular/platform-browser/testing';
 import { PlatformRef } from '@angular/core';
 import { StaticProvider } from '@angular/core';
 
 // @public
 export class BrowserDynamicTestingModule {
     // (undocumented)
-    static ɵfac: _angular_core.ɵɵFactoryDeclaration<BrowserDynamicTestingModule, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<BrowserDynamicTestingModule, never>;
     // (undocumented)
-    static ɵinj: _angular_core.ɵɵInjectorDeclaration<BrowserDynamicTestingModule>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<BrowserDynamicTestingModule>;
     // (undocumented)
-    static ɵmod: _angular_core.ɵɵNgModuleDeclaration<BrowserDynamicTestingModule, never, never, [typeof i1.BrowserTestingModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<BrowserDynamicTestingModule, never, never, [typeof i1.BrowserTestingModule]>;
 }
 
 // @public (undocumented)
diff --git a/goldens/public-api/platform-server/testing/index.api.md b/goldens/public-api/platform-server/testing/index.api.md
@@ -6,9 +6,10 @@
 
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/platform-browser-dynamic/testing';
+import { StaticProvider } from '@angular/core';
 
 // @public
-export const platformServerTesting: (extraProviders?: i0.StaticProvider[]) => i0.PlatformRef;
+export const platformServerTesting: (extraProviders?: StaticProvider[]) => i0.PlatformRef;
 
 // @public
 export class ServerTestingModule {
diff --git a/packages/platform-browser-dynamic/src/platform-browser-dynamic.ts b/packages/platform-browser-dynamic/src/platform-browser-dynamic.ts
@@ -6,20 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {createPlatformFactory} from '@angular/core';
-
-import {platformCoreDynamic} from './platform_core_dynamic';
-import {INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from './platform_providers';
-
-export * from './private_export';
 export {VERSION} from './version';
 export {JitCompilerFactory} from './compiler_factory';
+export {platformBrowserDynamic} from './platform_providers';
 
-/**
- * @publicApi
- */
-export const platformBrowserDynamic = createPlatformFactory(
-  platformCoreDynamic,
-  'browserDynamic',
-  INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
-);
+export * from './private_export';
diff --git a/packages/platform-browser-dynamic/src/platform_core_dynamic.ts b/packages/platform-browser-dynamic/src/platform_core_dynamic.ts
diff --git a/packages/platform-browser-dynamic/src/platform_providers.ts b/packages/platform-browser-dynamic/src/platform_providers.ts
@@ -6,22 +6,31 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {ɵPLATFORM_BROWSER_ID as PLATFORM_BROWSER_ID} from '@angular/common';
+import {
+  COMPILER_OPTIONS,
+  CompilerFactory,
+  createPlatformFactory,
+  StaticProvider,
+} from '@angular/core';
+import {platformBrowser} from '@angular/platform-browser';
 import {ResourceLoader} from '@angular/compiler';
-import {COMPILER_OPTIONS, PLATFORM_ID, StaticProvider} from '@angular/core';
-import {ɵINTERNAL_BROWSER_PLATFORM_PROVIDERS as INTERNAL_BROWSER_PLATFORM_PROVIDERS} from '@angular/platform-browser';
-
 import {ResourceLoaderImpl} from './resource_loader/resource_loader_impl';
+import {JitCompilerFactory} from './compiler_factory';
 
-/**
- * @publicApi
- */
 export const INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS: StaticProvider[] = [
-  INTERNAL_BROWSER_PLATFORM_PROVIDERS,
   {
     provide: COMPILER_OPTIONS,
     useValue: {providers: [{provide: ResourceLoader, useClass: ResourceLoaderImpl, deps: []}]},
     multi: true,
   },
-  {provide: PLATFORM_ID, useValue: PLATFORM_BROWSER_ID},
+  {provide: CompilerFactory, useClass: JitCompilerFactory, deps: [COMPILER_OPTIONS]},
 ];
+
+/**
+ * @publicApi
+ */
+export const platformBrowserDynamic = createPlatformFactory(
+  platformBrowser,
+  'browserDynamic',
+  INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
+);
diff --git a/packages/platform-browser-dynamic/src/private_export.ts b/packages/platform-browser-dynamic/src/private_export.ts
@@ -6,5 +6,4 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-export {platformCoreDynamic as ɵplatformCoreDynamic} from './platform_core_dynamic';
 export {INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS as ɵINTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from './platform_providers';
diff --git a/packages/platform-browser-dynamic/testing/src/platform_core_dynamic_testing.ts b/packages/platform-browser-dynamic/testing/src/platform_core_dynamic_testing.ts
diff --git a/packages/platform-browser-dynamic/testing/src/private_export_testing.ts b/packages/platform-browser-dynamic/testing/src/private_export_testing.ts
diff --git a/packages/platform-browser-dynamic/testing/src/testing.ts b/packages/platform-browser-dynamic/testing/src/testing.ts
@@ -7,20 +7,15 @@
  */
 
 import {createPlatformFactory, NgModule, PlatformRef, StaticProvider} from '@angular/core';
-import {ɵINTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS as INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from '@angular/platform-browser-dynamic';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {BrowserTestingModule} from '@angular/platform-browser/testing';
 
-import {platformCoreDynamicTesting} from './platform_core_dynamic_testing';
-
-export * from './private_export_testing';
-
 /**
  * @publicApi
  */
 export const platformBrowserDynamicTesting = createPlatformFactory(
-  platformCoreDynamicTesting,
+  platformBrowserDynamic,
   'browserDynamicTesting',
-  INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
 );
 
 /**
diff --git a/packages/platform-browser/src/browser.ts b/packages/platform-browser/src/browser.ts
@@ -183,7 +183,7 @@ export function _document(): any {
   return document;
 }
 
-export const INTERNAL_BROWSER_PLATFORM_PROVIDERS: StaticProvider[] = [
+const INTERNAL_BROWSER_PLATFORM_PROVIDERS: StaticProvider[] = [
   {provide: PLATFORM_ID, useValue: PLATFORM_BROWSER_ID},
   {provide: PLATFORM_INITIALIZER, useValue: initDomAdapter, multi: true},
   {provide: DOCUMENT, useFactory: _document, deps: []},
diff --git a/packages/platform-browser/src/private_export.ts b/packages/platform-browser/src/private_export.ts
@@ -7,10 +7,6 @@
  */
 
 export {ɵgetDOM} from '@angular/common';
-export {
-  initDomAdapter as ɵinitDomAdapter,
-  INTERNAL_BROWSER_PLATFORM_PROVIDERS as ɵINTERNAL_BROWSER_PLATFORM_PROVIDERS,
-} from './browser';
 export {BrowserDomAdapter as ɵBrowserDomAdapter} from './browser/browser_adapter';
 export {BrowserGetTestability as ɵBrowserGetTestability} from './browser/testability';
 export {DomRendererFactory2 as ɵDomRendererFactory2} from './dom/dom_renderer';
diff --git a/packages/platform-browser/testing/src/browser.ts b/packages/platform-browser/testing/src/browser.ts
@@ -11,35 +11,21 @@ import {
   APP_ID,
   createPlatformFactory,
   NgModule,
-  PLATFORM_INITIALIZER,
-  platformCore,
   StaticProvider,
   ɵinternalProvideZoneChangeDetection as internalProvideZoneChangeDetection,
   ɵChangeDetectionScheduler as ChangeDetectionScheduler,
   ɵChangeDetectionSchedulerImpl as ChangeDetectionSchedulerImpl,
 } from '@angular/core';
 import {TestComponentRenderer} from '@angular/core/testing';
-import {BrowserModule, ɵBrowserDomAdapter as BrowserDomAdapter} from '@angular/platform-browser';
+import {BrowserModule, platformBrowser} from '@angular/platform-browser';
 import {DOMTestComponentRenderer} from './dom_test_component_renderer';
 
-function initBrowserTests() {
-  BrowserDomAdapter.makeCurrent();
-}
-
-const _TEST_BROWSER_PLATFORM_PROVIDERS: StaticProvider[] = [
-  {provide: PLATFORM_INITIALIZER, useValue: initBrowserTests, multi: true},
-];
-
 /**
  * Platform for testing
  *
  * @publicApi
  */
-export const platformBrowserTesting = createPlatformFactory(
-  platformCore,
-  'browserTesting',
-  _TEST_BROWSER_PLATFORM_PROVIDERS,
-);
+export const platformBrowserTesting = createPlatformFactory(platformBrowser, 'browserTesting');
 
 /**
  * NgModule for testing.
diff --git a/packages/platform-browser/testing/src/private_export_testing.ts b/packages/platform-browser/testing/src/private_export_testing.ts
diff --git a/packages/platform-browser/testing/src/testing.ts b/packages/platform-browser/testing/src/testing.ts
@@ -12,4 +12,3 @@
  * Entry point for all public APIs of the platform-browser/testing package.
  */
 export * from './browser';
-export * from './private_export_testing';
diff --git a/packages/platform-server/testing/BUILD.bazel b/packages/platform-server/testing/BUILD.bazel
@@ -9,6 +9,7 @@ ng_module(
     srcs = glob(["**/*.ts"]),
     deps = [
         "//packages/core",
+        "//packages/platform-browser-dynamic",
         "//packages/platform-browser-dynamic/testing",
         "//packages/platform-server",
     ],
diff --git a/packages/platform-server/testing/src/server.ts b/packages/platform-server/testing/src/server.ts
@@ -6,25 +6,28 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {createPlatformFactory, NgModule} from '@angular/core';
-import {
-  BrowserDynamicTestingModule,
-  ɵplatformCoreDynamicTesting as platformCoreDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
+import {createPlatformFactory, NgModule, platformCore, StaticProvider} from '@angular/core';
+import {ɵINTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS as INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from '@angular/platform-browser-dynamic';
+import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing';
 import {
   ɵINTERNAL_SERVER_PLATFORM_PROVIDERS as INTERNAL_SERVER_PLATFORM_PROVIDERS,
   ɵSERVER_RENDER_PROVIDERS as SERVER_RENDER_PROVIDERS,
 } from '@angular/platform-server';
 
+const INTERNAL_SERVER_DYNAMIC_PLATFORM_TESTING_PROVIDERS: StaticProvider[] = [
+  ...INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
+  ...INTERNAL_SERVER_PLATFORM_PROVIDERS,
+];
+
 /**
  * Platform for testing
  *
  * @publicApi
  */
 export const platformServerTesting = createPlatformFactory(
-  platformCoreDynamicTesting,
+  platformCore,
   'serverTesting',
-  INTERNAL_SERVER_PLATFORM_PROVIDERS,
+  INTERNAL_SERVER_DYNAMIC_PLATFORM_TESTING_PROVIDERS,
 );
 
 /**
