hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict fixes

Browse Source
This commit is contained in:
jonas-atmire
2020-09-30 12:34:03 +02:00
parent dddf8df2b2
commit 988079caed
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
View File

@@ -24,9 +24,9 @@ import { RestResponse } from '../../core/cache/response.models';
import { VarDirective } from '../../shared/utils/var.directive'; import { VarDirective } from '../../shared/utils/var.directive';
import { import {
createSuccessfulRemoteDataObject$ createSuccessfulRemoteDataObject$
} from "../../shared/remote-data.utils"; } from '../../shared/remote-data.utils';
import {RouterStub} from "../../shared/testing/router.stub"; import {RouterStub} from '../../shared/testing/router.stub';
import {getItemEditPath, getItemPageRoute} from "../../+item-page/item-page-routing.module"; import { getItemEditRoute, getItemPageRoute } from '../../+item-page/item-page-routing-paths';
const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info'); const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning'); const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
@@ -242,7 +242,7 @@ describe('EditBitstreamPageComponent', () => {
it('should redirect to the item edit path bitstream page', () => { it('should redirect to the item edit path bitstream page', () => {
comp.itemId = 'some-uuid' comp.itemId = 'some-uuid'
comp.navigateToItemEditBitstreams(); comp.navigateToItemEditBitstreams();
expect(routerStub.navigate).toHaveBeenCalledWith([getItemEditPath('some-uuid'), 'bitstreams']); expect(routerStub.navigate).toHaveBeenCalledWith([getItemEditRoute('some-uuid'), 'bitstreams']);
}); });
}); });
describe('when navigateToItemEditBitstreams is called, and the component does not have an itemId', () => { describe('when navigateToItemEditBitstreams is called, and the component does not have an itemId', () => {