From 47bdc2b0b786a9ca6983c0fbec1983479bdea9a6 Mon Sep 17 00:00:00 2001 From: vikerman Date: Wed, 1 Mar 2017 11:16:56 -0800 Subject: [PATCH] fix(platform-server): don't setup Testability and TestabilityRegistry on the server (#14510) --- modules/@angular/core/src/application_ref.ts | 4 +--- modules/@angular/platform-server/src/server.ts | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/@angular/core/src/application_ref.ts b/modules/@angular/core/src/application_ref.ts index dd72a5d15f..b77168f29d 100644 --- a/modules/@angular/core/src/application_ref.ts +++ b/modules/@angular/core/src/application_ref.ts @@ -433,9 +433,7 @@ export class ApplicationRef_ extends ApplicationRef { private _zone: NgZone, private _console: Console, private _injector: Injector, private _exceptionHandler: ErrorHandler, private _componentFactoryResolver: ComponentFactoryResolver, - private _initStatus: ApplicationInitStatus, - @Optional() private _testabilityRegistry: TestabilityRegistry, - @Optional() private _testability: Testability) { + private _initStatus: ApplicationInitStatus) { super(); this._enforceNoNewChanges = isDevMode(); diff --git a/modules/@angular/platform-server/src/server.ts b/modules/@angular/platform-server/src/server.ts index e686b1abbe..84ec4fbe33 100644 --- a/modules/@angular/platform-server/src/server.ts +++ b/modules/@angular/platform-server/src/server.ts @@ -8,7 +8,7 @@ import {PlatformLocation, ɵPLATFORM_SERVER_ID as PLATFORM_SERVER_ID} from '@angular/common'; import {platformCoreDynamic} from '@angular/compiler'; -import {Injectable, InjectionToken, Injector, NgModule, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactoryV2, RootRenderer, createPlatformFactory, isDevMode, platformCore, ɵALLOW_MULTIPLE_PLATFORMS as ALLOW_MULTIPLE_PLATFORMS} from '@angular/core'; +import {Injectable, InjectionToken, Injector, NgModule, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactoryV2, RootRenderer, Testability, createPlatformFactory, isDevMode, platformCore, ɵALLOW_MULTIPLE_PLATFORMS as ALLOW_MULTIPLE_PLATFORMS} from '@angular/core'; import {HttpModule} from '@angular/http'; import {BrowserModule, DOCUMENT, ɵSharedStylesHost as SharedStylesHost, ɵgetDOM as getDOM} from '@angular/platform-browser'; @@ -52,7 +52,11 @@ export const SERVER_RENDER_PROVIDERS: Provider[] = [ @NgModule({ exports: [BrowserModule], imports: [HttpModule], - providers: [SERVER_RENDER_PROVIDERS, SERVER_HTTP_PROVIDERS], + providers: [ + SERVER_RENDER_PROVIDERS, + SERVER_HTTP_PROVIDERS, + {provide: Testability, useValue: null}, + ], }) export class ServerModule { }