From bffae34fccf64dc162dcccb9d5ca0370f56b172d Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Wed, 5 Feb 2020 16:32:18 +0100 Subject: [PATCH] Undo accidental commit --- src/app/core/data/request.reducer.spec.ts | 202 +++++++++++----------- 1 file changed, 101 insertions(+), 101 deletions(-) diff --git a/src/app/core/data/request.reducer.spec.ts b/src/app/core/data/request.reducer.spec.ts index 086c049481..d32fe348b5 100644 --- a/src/app/core/data/request.reducer.spec.ts +++ b/src/app/core/data/request.reducer.spec.ts @@ -21,104 +21,104 @@ class NullAction extends RequestCompleteAction { } } -// describe('requestReducer', () => { -// const id1 = 'clients/eca2ea1d-6a6a-4f62-8907-176d5fec5014'; -// const id2 = 'clients/eb7cde2e-a03f-4f0b-ac5d-888a4ef2b4eb'; -// const link1 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/567a639f-f5ff-4126-807c-b7d0910808c8'; -// const link2 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/1911e8a4-6939-490c-b58b-a5d70f8d91fb'; -// const testState: RequestState = { -// [id1]: { -// request: new GetRequest(id1, link1), -// requestPending: false, -// responsePending: false, -// completed: false, -// response: undefined -// } -// }; -// deepFreeze(testState); -// -// it('should return the current state when no valid actions have been made', () => { -// const action = new NullAction(); -// const newState = requestReducer(testState, action); -// -// expect(newState).toEqual(testState); -// }); -// -// it('should start with an empty state', () => { -// const action = new NullAction(); -// const initialState = requestReducer(undefined, action); -// -// expect(initialState).toEqual(Object.create(null)); -// }); -// -// it('should add the new RestRequest and set \'requestPending\' to true, \'responsePending\' to false and \'completed\' to false for the given RestRequest in the state, in response to a CONFIGURE action', () => { -// const state = testState; -// const request = new GetRequest(id2, link2); -// -// const action = new RequestConfigureAction(request); -// const newState = requestReducer(state, action); -// -// expect(newState[id2].request.uuid).toEqual(id2); -// expect(newState[id2].request.href).toEqual(link2); -// expect(newState[id2].requestPending).toEqual(true); -// expect(newState[id2].responsePending).toEqual(false); -// expect(newState[id2].completed).toEqual(false); -// expect(newState[id2].response).toEqual(undefined); -// }); -// -// it('should set \'requestPending\' to false, \'responsePending\' to true and leave \'completed\' untouched for the given RestRequest in the state, in response to an EXECUTE action', () => { -// const state = testState; -// -// const action = new RequestExecuteAction(id1); -// const newState = requestReducer(state, action); -// -// expect(newState[id1].request.uuid).toEqual(id1); -// expect(newState[id1].request.href).toEqual(link1); -// expect(newState[id1].requestPending).toEqual(false); -// expect(newState[id1].responsePending).toEqual(true); -// expect(newState[id1].completed).toEqual(state[id1].completed); -// expect(newState[id1].response).toEqual(undefined) -// }); -// -// it('should leave \'requestPending\' untouched, set \'responsePending\' to false and \'completed\' to true for the given RestRequest in the state, in response to a COMPLETE action', () => { -// const state = testState; -// -// const action = new RequestCompleteAction(id1, response); -// const newState = requestReducer(state, action); -// -// expect(newState[id1].request.uuid).toEqual(id1); -// expect(newState[id1].request.href).toEqual(link1); -// expect(newState[id1].requestPending).toEqual(state[id1].requestPending); -// expect(newState[id1].responsePending).toEqual(false); -// expect(newState[id1].completed).toEqual(true); -// expect(newState[id1].response.isSuccessful).toEqual(response.isSuccessful); -// expect(newState[id1].response.statusCode).toEqual(response.statusCode); -// expect(newState[id1].response.timeAdded).toBeTruthy() -// }); -// -// it('should leave \'requestPending\' untouched, should leave \'responsePending\' untouched and leave \'completed\' untouched, but update the response\'s timeAdded for the given RestRequest in the state, in response to a COMPLETE action', () => { -// const update = Object.assign({}, testState[id1], {response}); -// const state = Object.assign({}, testState, {[id1]: update}); -// const timeStamp = 1000; -// const action = new ResetResponseTimestampsAction(timeStamp); -// const newState = requestReducer(state, action); -// -// expect(newState[id1].request.uuid).toEqual(state[id1].request.uuid); -// expect(newState[id1].request.href).toEqual(state[id1].request.href); -// expect(newState[id1].requestPending).toEqual(state[id1].requestPending); -// expect(newState[id1].responsePending).toEqual(state[id1].responsePending); -// expect(newState[id1].completed).toEqual(state[id1].completed); -// expect(newState[id1].response.isSuccessful).toEqual(response.isSuccessful); -// 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(); -// }); -// }); +describe('requestReducer', () => { + const id1 = 'clients/eca2ea1d-6a6a-4f62-8907-176d5fec5014'; + const id2 = 'clients/eb7cde2e-a03f-4f0b-ac5d-888a4ef2b4eb'; + const link1 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/567a639f-f5ff-4126-807c-b7d0910808c8'; + const link2 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/1911e8a4-6939-490c-b58b-a5d70f8d91fb'; + const testState: RequestState = { + [id1]: { + request: new GetRequest(id1, link1), + requestPending: false, + responsePending: false, + completed: false, + response: undefined + } + }; + deepFreeze(testState); + + it('should return the current state when no valid actions have been made', () => { + const action = new NullAction(); + const newState = requestReducer(testState, action); + + expect(newState).toEqual(testState); + }); + + it('should start with an empty state', () => { + const action = new NullAction(); + const initialState = requestReducer(undefined, action); + + expect(initialState).toEqual(Object.create(null)); + }); + + it('should add the new RestRequest and set \'requestPending\' to true, \'responsePending\' to false and \'completed\' to false for the given RestRequest in the state, in response to a CONFIGURE action', () => { + const state = testState; + const request = new GetRequest(id2, link2); + + const action = new RequestConfigureAction(request); + const newState = requestReducer(state, action); + + expect(newState[id2].request.uuid).toEqual(id2); + expect(newState[id2].request.href).toEqual(link2); + expect(newState[id2].requestPending).toEqual(true); + expect(newState[id2].responsePending).toEqual(false); + expect(newState[id2].completed).toEqual(false); + expect(newState[id2].response).toEqual(undefined); + }); + + it('should set \'requestPending\' to false, \'responsePending\' to true and leave \'completed\' untouched for the given RestRequest in the state, in response to an EXECUTE action', () => { + const state = testState; + + const action = new RequestExecuteAction(id1); + const newState = requestReducer(state, action); + + expect(newState[id1].request.uuid).toEqual(id1); + expect(newState[id1].request.href).toEqual(link1); + expect(newState[id1].requestPending).toEqual(false); + expect(newState[id1].responsePending).toEqual(true); + expect(newState[id1].completed).toEqual(state[id1].completed); + expect(newState[id1].response).toEqual(undefined) + }); + + it('should leave \'requestPending\' untouched, set \'responsePending\' to false and \'completed\' to true for the given RestRequest in the state, in response to a COMPLETE action', () => { + const state = testState; + + const action = new RequestCompleteAction(id1, response); + const newState = requestReducer(state, action); + + expect(newState[id1].request.uuid).toEqual(id1); + expect(newState[id1].request.href).toEqual(link1); + expect(newState[id1].requestPending).toEqual(state[id1].requestPending); + expect(newState[id1].responsePending).toEqual(false); + expect(newState[id1].completed).toEqual(true); + expect(newState[id1].response.isSuccessful).toEqual(response.isSuccessful); + expect(newState[id1].response.statusCode).toEqual(response.statusCode); + expect(newState[id1].response.timeAdded).toBeTruthy() + }); + + it('should leave \'requestPending\' untouched, should leave \'responsePending\' untouched and leave \'completed\' untouched, but update the response\'s timeAdded for the given RestRequest in the state, in response to a COMPLETE action', () => { + const update = Object.assign({}, testState[id1], {response}); + const state = Object.assign({}, testState, {[id1]: update}); + const timeStamp = 1000; + const action = new ResetResponseTimestampsAction(timeStamp); + const newState = requestReducer(state, action); + + expect(newState[id1].request.uuid).toEqual(state[id1].request.uuid); + expect(newState[id1].request.href).toEqual(state[id1].request.href); + expect(newState[id1].requestPending).toEqual(state[id1].requestPending); + expect(newState[id1].responsePending).toEqual(state[id1].responsePending); + expect(newState[id1].completed).toEqual(state[id1].completed); + expect(newState[id1].response.isSuccessful).toEqual(response.isSuccessful); + 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(); + }); +});