mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
solved merge issues
This commit is contained in:
@@ -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);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@@ -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';
|
||||||
|
@@ -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);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user