mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
Merge branch 'performance-improvements-fall-2019' into w2p-65717_Bundles-in-edit-item
Conflicts: src/app/shared/mocks/mock-request.service.ts
This commit is contained in:
@@ -89,7 +89,7 @@ describe('HALEndpointService', () => {
|
||||
.returnValue(hot('a-', { a: 'https://rest.api/test' }));
|
||||
const result = service.getEndpoint(linkPath);
|
||||
|
||||
const expected = cold('b-', { b: endpointMap.test });
|
||||
const expected = cold('(b|)', { b: endpointMap.test });
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
|
||||
@@ -97,7 +97,7 @@ describe('HALEndpointService', () => {
|
||||
spyOn(service as any, 'getEndpointAt').and
|
||||
.returnValue(hot('a-', { a: undefined }));
|
||||
const result = service.getEndpoint('unknown');
|
||||
const expected = cold('b-', { b: undefined });
|
||||
const expected = cold('(b|)', { b: undefined });
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
});
|
||||
|
@@ -9,6 +9,7 @@ export function getMockRequestService(requestEntry$: Observable<RequestEntry> =
|
||||
getByHref: requestEntry$,
|
||||
getByUUID: requestEntry$,
|
||||
uriEncodeBody: jasmine.createSpy('uriEncodeBody'),
|
||||
isCachedOrPending: false,
|
||||
removeByHrefSubstring: jasmine.createSpy('removeByHrefSubstring'),
|
||||
hasByHrefObservable: observableOf(true)
|
||||
});
|
||||
|
Reference in New Issue
Block a user