mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-08 02:24:11 +00:00
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts: # src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts # src/app/core/cache/builders/remote-data-build.service.ts # src/app/core/core.effects.ts # src/app/core/core.reducers.ts # src/app/core/data/comcol-data.service.spec.ts # src/app/core/data/data.service.spec.ts # src/app/core/data/data.service.ts # src/app/core/shared/dspace-object.model.ts # src/app/shared/shared.module.ts # src/styles/_custom_variables.scss
This commit is contained in:
@@ -64,7 +64,7 @@ describe('Core Module - RxJS Operators', () => {
|
||||
scheduler.schedule(() => source.pipe(getRequestFromRequestHref(requestService)).subscribe());
|
||||
scheduler.flush();
|
||||
|
||||
expect(requestService.getByHref).toHaveBeenCalledWith(testRequestHref)
|
||||
expect(requestService.getByHref).toHaveBeenCalledWith(testRequestHref);
|
||||
});
|
||||
|
||||
it('shouldn\'t return anything if there is no request matching the self link', () => {
|
||||
@@ -159,6 +159,22 @@ describe('Core Module - RxJS Operators', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('getResponseFromEntry', () => {
|
||||
it('should return the response for all not empty request entries, when they have a value', () => {
|
||||
const source = hot('abcdefg', testRCEs);
|
||||
const result = source.pipe(getResponseFromEntry());
|
||||
const expected = cold('abcde--', {
|
||||
a: testRCEs.a.response,
|
||||
b: testRCEs.b.response,
|
||||
c: testRCEs.c.response,
|
||||
d: testRCEs.d.response,
|
||||
e: testRCEs.e.response
|
||||
});
|
||||
|
||||
expect(result).toBeObservable(expected)
|
||||
});
|
||||
});
|
||||
|
||||
describe('getSucceededRemoteData', () => {
|
||||
it('should return the first() hasSucceeded RemoteData Observable', () => {
|
||||
const testRD = {
|
||||
|
Reference in New Issue
Block a user