Feature/store test (#10)

* refactoring store

* store itself refactor

* bugfix for App and store

* 1.2.1

Author: reposandermets

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cli-react-redux",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "React Redux CLI",
   "main": "index.js",
   "scripts": {

package.json

@@ -2,7 +2,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 
 import Navigator from './Navigator';
-import getStore from './store';
+import { getStore } from './store';
 
 const App = () => (
   <Provider store={getStore()}>

src/templates/App

@@ -5,10 +5,6 @@ import App from '../App';
 // ./node_modules/.bin/jest ./src/__tests__/App.test.js --env=jsdom
 describe('<App />', () => {
   it('renders without crashing', () => {
-    window.fetch = () => ({
-      ok: true,
-      json: () => ({ foo: 'bar' }),
-    });
     const div = document.createElement('div');
     ReactDOM.render(<App />, div);
   });

src/templates/App.test

@@ -3,11 +3,11 @@ import React from 'react';
 import { ConnectedRouter } from 'react-router-redux';
 import { BrowserRouter, Switch, Route } from 'react-router-dom';
 
-import { history } from './store';
+import { getHistory } from './store';
 import '<NameOf>' from './containers/'<nameof>'';
 
 const Navigator = () => (
-  <ConnectedRouter history={history}>
+  <ConnectedRouter history={getHistory()}>
     <BrowserRouter>
       <Switch>
         <Route exact path="/" component={'<NameOf>'} />

src/templates/Navigator

@@ -7,7 +7,7 @@ const initialState = {
 const '<nameOf>'Reducer = (state = initialState, action) => {
   switch (action.type) {
     case actionType.FETCH_DATA_SUCCESS: {
-      const data = action.payload.results;
+      const { data } = action.payload.results;
       return {
         ...state,
         data,

src/templates/reducer

@@ -17,9 +17,9 @@ describe('<'<NameOf>' /> reducer', () => {
   });
 
   it('should handle the fetchDataSuccess action correctly', () => {
-    const fixture = { foo: 'bar' };
+    const fixture = { data: { foo: 'bar' } };
     const expectedResult = {
-      data: fixture,
+      data: fixture.data,
     };
 
     expect('<nameOf>'Reducer(state, {

src/templates/reducer.test

@@ -1,4 +1,5 @@
 import { put, call, takeEvery } from 'redux-saga/effects';
+import axios from 'axios';
 import * as actionType from './actionTypes';
 
 export function* fetchDataAsync() {

src/templates/sagas

@@ -1,4 +1,5 @@
 import { call, put, takeEvery } from 'redux-saga/effects';
+import axios from 'axios';
 import { fetchDataAsync, watch'<NameOf>'Sagas } from '../sagas';
 import * as actionType from '../actionTypes';
 

src/templates/sagas.test

@@ -5,35 +5,50 @@ import createHistory from 'history/createBrowserHistory'; // eslint-disable-line
 import rootReducer from './rootReducer';
 import rootSaga from './rootSaga';
 
-export const history = createHistory();
-
-const initialState = {};
-const enhancers = [];
-const sagaMiddleware = createSagaMiddleware();
-const middleware = [
-  sagaMiddleware,
-  routerMiddleware(history),
-];
-
-if (process.env.NODE_ENV === 'development') {
-  const { devToolsExtension } = window;
-  if (typeof devToolsExtension === 'function') {
-    enhancers.push(devToolsExtension());
+export const storeElements = {
+  history: undefined,
+  store: undefined,
+};
+
+export default function configureStore() {
+  storeElements.history = createHistory();
+
+  const initialState = {};
+  const enhancers = [];
+  const sagaMiddleware = createSagaMiddleware();
+  const middleware = [
+    sagaMiddleware,
+    routerMiddleware(storeElements.history),
+  ];
+
+  if (process.env.NODE_ENV === 'development') {
+    const { devToolsExtension } = window;
+    if (typeof devToolsExtension === 'function') {
+      enhancers.push(devToolsExtension());
+    }
   }
-}
 
-const composedEnhancers = compose(
-  applyMiddleware(...middleware),
-  ...enhancers,
-);
+  const composedEnhancers = compose(
+    applyMiddleware(...middleware),
+    ...enhancers,
+  );
+
+  storeElements.store = createStore(
+    rootReducer(),
+    initialState,
+    composedEnhancers,
+  );
 
-const store = createStore(
-  rootReducer(),
-  initialState,
-  composedEnhancers,
-);
+  sagaMiddleware.run(rootSaga);
+}
+
+export function getStore() {
+  if(!storeElements.store) {
+    configureStore();
+  }
+  return storeElements.store;
+}
 
-sagaMiddleware.run(rootSaga);
-export default function getStore() {
-  return store;
+export function getHistory() {
+  return storeElements.history;
 }