solved merge issues

This commit is contained in:
lotte
2020-06-26 14:27:28 +02:00
parent 6ad7cee7d1
commit 9677e053f5
3 changed files with 5 additions and 2 deletions

View File

@@ -31,8 +31,8 @@ describe('I18nBreadcrumbResolver', () => {
}); });
it('should resolve the breadcrumb config', () => { it('should resolve the breadcrumb config', () => {
const resolvedConfig = resolver.resolve({ data: { breadcrumbKey: i18nKey }, url: [path], pathFromRoot: [{ url: [path] }] } as any, {} as any); const resolvedConfig = resolver.resolve(route, {} as any);
const expectedConfig = { provider: i18nBreadcrumbService, key: i18nKey, url: path }; const expectedConfig = { provider: i18nBreadcrumbService, key: i18nKey, url: expectedPath };
expect(resolvedConfig).toEqual(expectedConfig); expect(resolvedConfig).toEqual(expectedConfig);
}); });

View File

@@ -50,3 +50,5 @@ if (hasValue(environment.universal) && environment.universal.preboot === false)
} else { } else {
document.addEventListener('DOMContentLoaded', () => bootloader(main)); document.addEventListener('DOMContentLoaded', () => bootloader(main));
} }
import 'zone.js/dist/zone';

View File

@@ -18,3 +18,4 @@ getTestBed().initTestEnvironment(
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules. // And load the modules.
context.keys().map(context); context.keys().map(context);