c[finishes #169703465] ache previously selected movies

Easybuoy · Nov 12, 2019 · 40c6080 · 40c6080
1 parent 34a3173
commit 40c6080
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/src/actions/actions.test.js b/src/actions/actions.test.js
@@ -110,7 +110,7 @@ describe('Actions', () => {
         type: LOADING
       }
     ];
-    store.dispatch(getCharacter([]));
+    store.dispatch(getCharacter({ characters: [''] }));
     expect(store.getActions()).toEqual(expectedActions);
     expect(store.getActions()).toMatchSnapshot();
     done();
@@ -141,7 +141,7 @@ describe('Actions', () => {
       }
     ];
     const store = mockStore({});
-    return store.dispatch(getCharacter([''])).then(() => {
+    return store.dispatch(getCharacter({ characters: [''] })).then(() => {
       expect(store.getActions()).toEqual(expectedActions);
       done();
     });

diff --git a/src/actions/index.js b/src/actions/index.js
@@ -49,7 +49,7 @@ export const getMovie = movie_url => dispatch => {
 };
 
 export const getCharacter = movie => dispatch => {
-  const { characters } = movie;
+  const { characters } = movie; 
 
   dispatch({ type: LOADING });
   return Promise.all(

diff --git a/src/components/Common/MovieListDropdown.jsx b/src/components/Common/MovieListDropdown.jsx
@@ -3,12 +3,16 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import PreLoader from '../Common/PreLoader';
-import { getMovies, selectMovie, getMovie, setCharacters, setMovie } from '../../actions';
 import {
-  MovieListDropdown as StyledMovieListDropdown
-} from '../../styles';
+  getMovies,
+  selectMovie,
+  getMovie,
+  setCharacters,
+  setMovie
+} from '../../actions';
+import { MovieListDropdown as StyledMovieListDropdown } from '../../styles';
 import Select from './Select';
-import { getMovieFromLocalStorage} from '../../utils'
+import { getMovieFromLocalStorage } from '../../utils';
 
 export const MovieListDropdown = ({
   movies,
@@ -33,11 +37,11 @@ export const MovieListDropdown = ({
     selectMovie(title);
 
     // check if movie exist in localstorage
-    const existingMovieInLocalStorage = getMovieFromLocalStorage(title)
+    const existingMovieInLocalStorage = getMovieFromLocalStorage(title);
     if (existingMovieInLocalStorage.length > 0) {
       // we found the movie in localstorage
-      setCharacters(existingMovieInLocalStorage[0].characters)
-      setMovie(existingMovieInLocalStorage[0].movie)
+      setCharacters(existingMovieInLocalStorage[0].characters);
+      setMovie(existingMovieInLocalStorage[0].movie);
     } else {
       //we could not find movie in localstorage, thus get from api
       getMovie(url);
@@ -83,7 +87,7 @@ const mapStateToProps = state => ({
   error: state.error.error,
   movies: state.swapi.movies,
   movie: state.swapi.movie,
-  selectedMovie: state.swapi.selectedMovie,
+  selectedMovie: state.swapi.selectedMovie
 });
 
 export default connect(

diff --git a/src/components/Common/MovieListDropdown.test.jsx b/src/components/Common/MovieListDropdown.test.jsx
@@ -11,7 +11,9 @@ describe('<MovieListDropdown />', () => {
     movies: getMoviesMock,
     getMovies: jest.fn(),
     selectMovie: jest.fn(),
-    getMovie: jest.fn()
+    getMovie: jest.fn(),
+    setCharacters: jest.fn(),
+    setMovie: jest.fn()
   };
 
   it('renders the MovieListDropdown component correctly', () => {

diff --git a/src/utils/index.test.js b/src/utils/index.test.js
@@ -6,7 +6,8 @@ import {
   formatHeight,
   sortHeight,
   sortName,
-  sortGender
+  sortGender,
+  initializeLocalStorage
 } from './index';
 
 describe('Util', () => {
@@ -164,4 +165,9 @@ describe('Util', () => {
     const response = sortGender(testArray, 'M');
     expect(response).toEqual([{ name: 'Ezekiel', height: 10, gender: 'male' }]);
   });
+
+  it('test initializeLocalStorage', () => {
+    localStorage.removeItem('movieData')
+    expect(initializeLocalStorage()).toEqual(undefined);
+  });
 });