mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-20 20:33:32 +08:00
refactor(module-loader): fix tests, don't purge loaded module promise from the map
fix tests, don't purge loaded module promise from the map
This commit is contained in:
@ -36,11 +36,8 @@ export class ModuleLoader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return promise.then(loadedModule => {
|
return promise.then(loadedModule => {
|
||||||
// clear it from the cache
|
|
||||||
this._promiseMap.delete(modulePath);
|
|
||||||
console.timeEnd(`ModuleLoader, load: ${modulePath}'`);
|
console.timeEnd(`ModuleLoader, load: ${modulePath}'`);
|
||||||
const ref = loadedModule.create(this._injector);
|
const ref = loadedModule.create(this._injector);
|
||||||
|
|
||||||
const component = ref.injector.get(LAZY_LOADED_TOKEN);
|
const component = ref.injector.get(LAZY_LOADED_TOKEN);
|
||||||
|
|
||||||
this._cfrMap.set(component, ref.componentFactoryResolver);
|
this._cfrMap.set(component, ref.componentFactoryResolver);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { ModuleLoader } from '../module-loader';
|
import { ModuleLoader, LAZY_LOADED_TOKEN } from '../module-loader';
|
||||||
import { mockModuleLoader, mockNgModuleLoader } from '../mock-providers';
|
import { mockModuleLoader, mockNgModuleLoader } from '../mock-providers';
|
||||||
import { NgModuleLoader } from '../ng-module-loader';
|
import { NgModuleLoader } from '../ng-module-loader';
|
||||||
|
|
||||||
@ -8,7 +8,21 @@ describe('module-loader', () => {
|
|||||||
describe('load', () => {
|
describe('load', () => {
|
||||||
|
|
||||||
it('should call ngModuleLoader and receive a promise back', (done: Function) => {
|
it('should call ngModuleLoader and receive a promise back', (done: Function) => {
|
||||||
spyOn(ngModuleLoader, 'load').and.returnValue(Promise.resolve());
|
const mockLoadedModule = {
|
||||||
|
create: () => { }
|
||||||
|
};
|
||||||
|
const mockComponentFactoryResolver = {};
|
||||||
|
const mockInjector = {
|
||||||
|
get: () => { }
|
||||||
|
};
|
||||||
|
const mockNgModuleRef = {
|
||||||
|
injector: mockInjector,
|
||||||
|
componentFactoryResolver: mockComponentFactoryResolver
|
||||||
|
};
|
||||||
|
const mockComponent = {};
|
||||||
|
spyOn(mockInjector, mockInjector.get.name).and.returnValue(mockComponent);
|
||||||
|
spyOn(mockLoadedModule, mockLoadedModule.create.name).and.returnValue(mockNgModuleRef);
|
||||||
|
spyOn(ngModuleLoader, 'load').and.returnValue(Promise.resolve(mockLoadedModule));
|
||||||
|
|
||||||
let pathPrefix = '../some/known/path';
|
let pathPrefix = '../some/known/path';
|
||||||
let exportSuffix = 'SomeModule';
|
let exportSuffix = 'SomeModule';
|
||||||
@ -18,6 +32,11 @@ describe('module-loader', () => {
|
|||||||
|
|
||||||
promise.then((response) => {
|
promise.then((response) => {
|
||||||
expect(ngModuleLoader.load).toHaveBeenCalledWith(pathPrefix, exportSuffix);
|
expect(ngModuleLoader.load).toHaveBeenCalledWith(pathPrefix, exportSuffix);
|
||||||
|
expect(mockLoadedModule.create).toHaveBeenCalledWith(null); // whatever the injector is
|
||||||
|
expect(mockInjector.get).toHaveBeenCalledWith(LAZY_LOADED_TOKEN);
|
||||||
|
expect(response.component).toEqual(mockComponent);
|
||||||
|
expect(response.componentFactoryResolver).toEqual(mockComponentFactoryResolver);
|
||||||
|
done();
|
||||||
}).catch((err: Error) => {
|
}).catch((err: Error) => {
|
||||||
fail(err);
|
fail(err);
|
||||||
done(err);
|
done(err);
|
||||||
|
Reference in New Issue
Block a user