fix(ivy): TestBed.get should be able to retrieve tokens from Compiler's injector (#28196)
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:
parent
583061d043
commit
030350f53e
|
@ -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[] = [];
|
||||
|
|
|
@ -63,8 +63,7 @@ if (isBrowser) {
|
|||
{providers: [{provide: FancyService, useValue: new FancyService()}]});
|
||||
});
|
||||
|
||||
fixmeIvy('FW-919: TestBed.get should be able to retrieve tokens from Compiler\'s injector')
|
||||
.it('provides a real ResourceLoader instance',
|
||||
it('provides a real ResourceLoader instance',
|
||||
inject([ResourceLoader], (resourceLoader: ResourceLoader) => {
|
||||
expect(resourceLoader instanceof ResourceLoaderImpl).toBeTruthy();
|
||||
}));
|
||||
|
|
Loading…
Reference in New Issue