diff options
| -rw-r--r-- | src/client/react/store/reducers.js | 7 | ||||
| -rw-r--r-- | src/client/react/store/reducers.test.js | 158 |
2 files changed, 71 insertions, 94 deletions
diff --git a/src/client/react/store/reducers.js b/src/client/react/store/reducers.js index 3425de0..c5c564c 100644 --- a/src/client/react/store/reducers.js +++ b/src/client/react/store/reducers.js @@ -22,9 +22,6 @@ import getSearchResults from '../lib/getSearchResults'; import users from '../users'; const DEFAULT_STATE = { - // results: [ - // 's/18562', - // ], search: { results: [], text: '', @@ -88,6 +85,10 @@ function reducer(state = DEFAULT_STATE, action) { } case 'SEARCH/CHANGE_SELECTED_RESULT': { + if (state.search.results.length === 0) { + return state; + } + const prevSelectedResult = state.search.selected; const prevSelectedResultIndex = state.search.results.indexOf(prevSelectedResult); let nextSelectedResultIndex = prevSelectedResultIndex + action.relativeChange; diff --git a/src/client/react/store/reducers.test.js b/src/client/react/store/reducers.test.js index cd195b0..ae4d664 100644 --- a/src/client/react/store/reducers.test.js +++ b/src/client/react/store/reducers.test.js @@ -35,119 +35,95 @@ const reducer = require('./reducers').default; const { DEFAULT_STATE } = require('./reducers')._test; describe('reducers', () => { - describe('search', () => { - describe('SEARCH/SET_USER', () => { - it('Resets the search state if the user is null', () => { - const prevState = { search: { foo: 'bar' } }; - const action = { type: 'SEARCH/SET_USER', user: null }; + beforeAll(() => { + deepFreeze(DEFAULT_STATE); + }); - deepFreeze([prevState, action]); + describe('SEARCH/SET_USER', () => { + it('Resets the search state if the user is null', () => { + const prevState = { search: { foo: 'bar' } }; + const action = { type: 'SEARCH/SET_USER', user: null }; - expect(reducer(prevState, action)).toEqual({ - search: DEFAULT_STATE.search, - }); + deepFreeze([prevState, action]); + + expect(reducer(prevState, action)).toEqual({ + search: DEFAULT_STATE.search, }); + }); - it('Sets all the values of that user properly', () => { - expect(reducer(undefined, { type: 'SEARCH/SET_USER', user: 's/18561' })).toEqual({ - ...DEFAULT_STATE, - search: { - results: [], - text: '18561', - selected: 's/18561', - }, - }); + it('Sets all the values of that user properly', () => { + expect(reducer(undefined, { type: 'SEARCH/SET_USER', user: 's/18561' })).toEqual({ + ...DEFAULT_STATE, + search: { + results: [], + text: '18561', + selected: 's/18561', + }, }); }); + }); - describe('SEARCH/INPUT_CHANGE', () => { - it('Returns no results when nothing is typed in', () => { - expect(reducer(undefined, { type: 'SEARCH/INPUT_CHANGE', searchText: '' })).toEqual({ - ...DEFAULT_STATE, - search: { - results: [], - text: '', - selected: null, - }, + describe('SEARCH/INPUT_CHANGE', () => { + describe('searchText is empty or whitespace-only', () => { + it('Returns no results', () => { + ['', ' ', '\t'].forEach((searchText) => { + const prevState = undefined; + const action = { type: 'SEARCH/INPUT_CHANGE', searchText }; + deepFreeze([prevState, action]); + const nextState = reducer(prevState, action); + + expect(nextState).toEqual({ + ...DEFAULT_STATE, + search: { + results: [], + text: searchText, + selected: null, + }, + }); }); }); + }); - it('Returns no results when a space is typed in', () => { - expect(reducer(undefined, { type: 'SEARCH/INPUT_CHANGE', searchText: ' ' })).toEqual({ - ...DEFAULT_STATE, - search: { - results: [], - text: ' ', - selected: null, - }, - }); + describe('searchText is 18', () => { + let nextState; + beforeAll(() => { + const prevState = undefined; + const action = { type: 'SEARCH/INPUT_CHANGE', searchText: '18' }; + deepFreeze([prevState, action]); + nextState = reducer(prevState, action); }); - it('Preforms a basic search, only returning four results', () => { - expect(reducer(undefined, { type: 'SEARCH/INPUT_CHANGE', searchText: '18' })).toEqual({ - ...DEFAULT_STATE, - search: { - results: [ - 's/18561', - 's/18562', - 's/18563', - 's/18564', - ], - text: '18', - selected: null, - }, - }); + it('Only returns 4 results', () => { + expect(nextState.search.results).toHaveLength(4); + }); + + it('Selects the first result', () => { + expect(nextState.search.selected).toEqual('s/18561'); + }); + + it('Copies the searchText over to state.search.text', () => { + expect(nextState.search.text).toEqual('18'); }); }); + }); - describe('SEARCH/CHANGE_SELECTED_RESULT', () => { - it('Does nothing when there are no results', () => { + describe('SEARCH/CHANGE_SELECTED_RESULT', () => { + describe('State has no results', () => { + it('Does nothing', () => { const actionPlus = { type: 'SEARCH/CHANGE_SELECTED_RESULT', relativeChange: +1 }; const actionMin = { type: 'SEARCH/CHANGE_SELECTED_RESULT', relativeChange: -1 }; - deepFreeze([DEFAULT_STATE, actionPlus, actionMin]); + deepFreeze([actionPlus, actionMin]); const nextStatePlus = reducer(DEFAULT_STATE, actionPlus); const nextStateMin = reducer(DEFAULT_STATE, actionMin); expect(nextStatePlus).toEqual(DEFAULT_STATE); expect(nextStateMin).toEqual(DEFAULT_STATE); }); + }); - it('Switches to the correct selectedResult when no selected result is selected', () => { - const prevState = { - ...DEFAULT_STATE, - search: { - results: ['s/18561', 's/18562', 's/18563'], - text: '1856', - selected: null, - }, - }; - - const actionPlus = { type: 'SEARCH/CHANGE_SELECTED_RESULT', relativeChange: +1 }; - const actionMin = { type: 'SEARCH/CHANGE_SELECTED_RESULT', relativeChange: -1 }; - - deepFreeze([prevState, actionPlus, actionMin]); - - const nextStatePlus = reducer(prevState, actionPlus); - const nextStateMin = reducer(prevState, actionMin); - - expect(nextStatePlus).toEqual({ - ...prevState, - search: { - ...prevState.search, - selected: 's/18561', - }, - }); - expect(nextStateMin).toEqual({ - ...prevState, - search: { - ...prevState.search, - selected: 's/18563', - }, - }); - }); - - it('Switches to the correct selectedResult when there is a selected result selected', () => { + describe('State has many results', () => { + it('Switches to the correct selectedResult', () => { const prevState = { ...DEFAULT_STATE, search: { @@ -194,7 +170,7 @@ describe('reducers', () => { search: { results: ['s/18561', 's/18562', 's/18563'], text: '1856', - selected: null, + selected: 's/18561', }, }); @@ -203,7 +179,7 @@ describe('reducers', () => { search: { results: ['s/18561', 's/18562', 's/18563'], text: '1856', - selected: null, + selected: 's/18563', }, }, { type: 'SEARCH/CHANGE_SELECTED_RESULT', relativeChange: +1 })).toEqual({ ...DEFAULT_STATE, @@ -228,7 +204,7 @@ describe('reducers', () => { search: { results: ['s/18561', 's/18562', 's/18563'], text: '1856', - selected: null, + selected: 's/18563', }, }); |