correct loading value and resulting tests

This commit is contained in:
Maren Süwer
2018-07-17 15:06:12 +02:00
parent 52714b8d3b
commit b41c262797
2 changed files with 15 additions and 7 deletions

View File

@@ -219,8 +219,12 @@ export default function reducer(state: any = {}, action: any = {}) {
switch (action.type) {
case FETCH_USERS:
return {
loading: true,
error: null
...state,
users: {
error: null,
entries: null,
loading: true
}
};
case DELETE_USER:
return {
@@ -246,13 +250,17 @@ export default function reducer(state: any = {}, action: any = {}) {
usersByNames
};
case FETCH_USERS_FAILURE:
case DELETE_USER_FAILURE:
return {
...state,
login: false,
error: action.payload,
loading: false
};
};
case DELETE_USER_FAILURE:
return {
...state,
error: action.payload,
loading: false
};
default:
return state;

View File

@@ -157,8 +157,8 @@ describe("fetch tests", () => {
describe("reducer tests", () => {
test("users request", () => {
var newState = reducer({}, { type: FETCH_USERS });
expect(newState.loading).toBeTruthy();
expect(newState.error).toBeNull();
expect(newState.users.loading).toBeTruthy();
expect(newState.users.error).toBeNull();
});
test("fetch users successful", () => {