cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ivy): TestBed.get should be able to retrieve tokens from Compiler's injector (#28196)

Browse Source 
This changes restores parity between VE TestBed and R3TestBed logic related to retrieving tokens using TestBed.get function. Now R3TestBed also tries to retrieve tokens from Compiler Injector.

PR Close #28196
This commit is contained in:
Andrew Kushnir
2019-01-16 17:13:23 -08:00
committed by Alex Rickabaugh
parent 583061d043
commit 030350f53e
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/testing/src/r3_test_bed.ts
View File

@ -65,6 +65,8 @@ let _nextRootElementId = 0;
const EMPTY_ARRAY: Type<any>[] = [];
const UNDEFINED: Symbol = Symbol('UNDEFINED');
// Resolvers for Angular decorators
type Resolvers = {
module: Resolver<NgModule>,
@ -311,6 +313,7 @@ export class TestBedRender3 implements Injector, TestBed {
// reset test module config
this._providers = [];
this._compilerOptions = [];
this._compilerProviders = [];
this._declarations = [];
this._imports = [];
this._schemas = [];
@ -405,7 +408,8 @@ export class TestBedRender3 implements Injector, TestBed {
if (token === TestBedRender3) {
return this;
}
return this._moduleRef.injector.get(token, notFoundValue);
const result = this._moduleRef.injector.get(token, UNDEFINED);
return result === UNDEFINED ? this.compilerInjector.get(token, notFoundValue) : result;
}
execute(tokens: any[], fn: Function, context?: any): any {
@ -590,8 +594,8 @@ export class TestBedRender3 implements Injector, TestBed {
}
get compilerInjector(): Injector {
if (this._compilerInjector !== undefined) {
this._compilerInjector;
if (this._compilerInjector !== null) {
return this._compilerInjector;
}
const providers: StaticProvider[] = [];