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

Merge remote-tracking branch 'remotes/origin/master' into submission

Browse Source 
# Conflicts:
#	src/app/core/cache/models/normalized-object-factory.ts
#	src/app/core/cache/response.models.ts
#	src/app/core/data/registry-metadatafields-response-parsing.service.ts
#	src/app/core/data/registry-metadataschemas-response-parsing.service.ts
#	src/app/core/data/request.models.ts
#	src/app/core/data/request.service.ts
#	src/app/core/shared/collection.model.ts
#	src/app/core/shared/dspace-object.model.ts
#	src/app/core/shared/resource-type.ts
This commit is contained in:
Giuseppe Digilio
2019-02-22 12:20:28 +01:00
parent 84cf0d055a eb818e4d69
commit a42dd19624
115 changed files with 3820 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/core/data/request.reducer.spec.ts
View File

@@ -4,7 +4,7 @@ import { requestReducer, RequestState } from './request.reducer';
import {
RequestCompleteAction,
RequestConfigureAction,
RequestExecuteAction, ResetResponseTimestampsAction
RequestExecuteAction, RequestRemoveAction, ResetResponseTimestampsAction
} from './request.actions';
import { GetRequest } from './request.models';
import { RestResponse } from '../cache/response.models';
@@ -110,4 +110,13 @@ describe('requestReducer', () => {
expect(newState[id1].response.statusCode).toEqual(response.statusCode);
expect(newState[id1].response.timeAdded).toBe(timeStamp);
});
it('should remove the correct request, in response to a REMOVE action', () => {
const state = testState;
const action = new RequestRemoveAction(id1);
const newState = requestReducer(state, action);
expect(newState[id1]).toBeUndefined();
});
});