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:
Dan Bucholtz
2017-04-18 15:05:52 -05:00
parent f88823a30f
commit ff467db339
2 changed files with 79 additions and 63 deletions

View File

@ -36,11 +36,8 @@ export class ModuleLoader {
}
return promise.then(loadedModule => {
// clear it from the cache
this._promiseMap.delete(modulePath);
console.timeEnd(`ModuleLoader, load: ${modulePath}'`);
const ref = loadedModule.create(this._injector);
const component = ref.injector.get(LAZY_LOADED_TOKEN);
this._cfrMap.set(component, ref.componentFactoryResolver);

View File

@ -1,4 +1,4 @@
import { ModuleLoader } from '../module-loader';
import { ModuleLoader, LAZY_LOADED_TOKEN } from '../module-loader';
import { mockModuleLoader, mockNgModuleLoader } from '../mock-providers';
import { NgModuleLoader } from '../ng-module-loader';
@ -8,7 +8,21 @@ describe('module-loader', () => {
describe('load', () => {
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 exportSuffix = 'SomeModule';
@ -18,6 +32,11 @@ describe('module-loader', () => {
promise.then((response) => {
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) => {
fail(err);
done(err);