diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts index 7ff15cad6d..95885a572c 100644 --- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts +++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts @@ -209,7 +209,7 @@ describe('BitstreamFormatsComponent', () => { selectBitstreamFormat: {}, deselectBitstreamFormat: {}, deselectAllBitstreamFormats: {}, - delete: observableOf(true), + delete: observableOf({ isSuccessful: true }), clearBitStreamFormatRequests: observableOf('cleared') }); diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts index 9184889257..58ace38adf 100644 --- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts @@ -115,7 +115,7 @@ describe('ItemBitstreamsComponent', () => { } ); bitstreamService = jasmine.createSpyObj('bitstreamService', { - deleteAndReturnResponse: jasmine.createSpy('deleteAndReturnResponse') + delete: jasmine.createSpy('delete') }); objectCache = jasmine.createSpyObj('objectCache', { remove: jasmine.createSpy('remove') @@ -183,12 +183,12 @@ describe('ItemBitstreamsComponent', () => { comp.submit(); }); - it('should call deleteAndReturnResponse on the bitstreamService for the marked field', () => { - expect(bitstreamService.deleteAndReturnResponse).toHaveBeenCalledWith(bitstream2.id); + it('should call delete on the bitstreamService for the marked field', () => { + expect(bitstreamService.delete).toHaveBeenCalledWith(bitstream2.id); }); - it('should not call deleteAndReturnResponse on the bitstreamService for the unmarked field', () => { - expect(bitstreamService.deleteAndReturnResponse).not.toHaveBeenCalledWith(bitstream1.id); + it('should not call delete on the bitstreamService for the unmarked field', () => { + expect(bitstreamService.delete).not.toHaveBeenCalledWith(bitstream1.id); }); it('should send out a patch for the move operations', () => { diff --git a/src/app/core/data/bitstream-format-data.service.spec.ts b/src/app/core/data/bitstream-format-data.service.spec.ts index 7954416010..99bf4eea18 100644 --- a/src/app/core/data/bitstream-format-data.service.spec.ts +++ b/src/app/core/data/bitstream-format-data.service.spec.ts @@ -281,7 +281,7 @@ describe('BitstreamFormatDataService', () => { format.uuid = 'format-uuid'; format.id = 'format-id'; - const expected = cold('(b|)', {b: true}); + const expected = cold('(b|)', { b: responseCacheEntry.response }); const result = service.delete(format.id); expect(result).toBeObservable(expected); diff --git a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts index dbbeea5bc6..76653954d2 100644 --- a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts +++ b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts @@ -48,7 +48,7 @@ describe('DeleteComColPageComponent', () => { dsoDataService = jasmine.createSpyObj( 'dsoDataService', { - delete: observableOf(true) + delete: observableOf({ isSuccessful: true }) }); routerStub = { @@ -106,7 +106,7 @@ describe('DeleteComColPageComponent', () => { }); it('should show an error notification on failure', () => { - (dsoDataService.delete as any).and.returnValue(observableOf(false)); + (dsoDataService.delete as any).and.returnValue(observableOf({ isSuccessful: false })); spyOn(router, 'navigate'); comp.onConfirm(data2); fixture.detectChanges(); diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts index 00f5422b27..6f9efca7d3 100644 --- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts +++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts @@ -148,7 +148,7 @@ describe('WorkspaceitemActionsComponent', () => { it('should display a success notification on delete success', async(() => { spyOn((component as any).modalService, 'open').and.returnValue({result: Promise.resolve('ok')}); - mockDataService.delete.and.returnValue(observableOf(true)); + mockDataService.delete.and.returnValue(observableOf({ isSuccessful: true })); spyOn(component, 'reload'); component.confirmDiscard('ok');