Skip to content

Commit

Permalink
Merge branch 'develop' into 332_add_contributors_to_readme
Browse files Browse the repository at this point in the history
  • Loading branch information
aonomike committed Jul 14, 2019
2 parents 76e8678 + bf47ad4 commit 1a5af47
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 16 deletions.
2 changes: 0 additions & 2 deletions src/reducers/rootReducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import { combineReducers } from 'redux'
import { reducer as formReducer } from 'redux-form'
import artists from './artists/artistsReducer'
import simpleReducer from './simpleReducer'
export default combineReducers({
simpleReducer,
artists,
form: formReducer
})
13 changes: 0 additions & 13 deletions src/reducers/simpleReducer.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/store/store.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ describe('store', () => {
it('should return default state', () => {
const store = configureStore()
const state = store.getState()
expect(state.simpleReducer).toEqual({})
expect(state.artists).toEqual([])
})
})

0 comments on commit 1a5af47

Please sign in to comment.