Merge branch 'develop' into button-router-test

Author: Alexis Hope

client/test-utils.js

@@ -14,16 +14,15 @@
 import { render } from '@testing-library/react';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { createStore } from 'redux';
 import { Provider } from 'react-redux';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
 import { I18nextProvider } from 'react-i18next';
 import { ThemeProvider as StyledThemeProvider } from 'styled-components';
 
 import i18n from './i18n-test';
-import rootReducer from './reducers';
 import ThemeProvider from './modules/App/components/ThemeProvider';
+import configureStore from './store';
 import theme, { Theme } from './theme';
 
 export const history = createMemoryHistory();
@@ -47,11 +46,7 @@ Providers.propTypes = {
 
 function reduxRender(
   ui,
-  {
-    initialState,
-    store = createStore(rootReducer, initialState),
-    ...renderOptions
-  } = {}
+  { initialState, store = configureStore(initialState), ...renderOptions } = {}
 ) {
   function Wrapper({ children }) {
     return (
@@ -69,7 +64,7 @@ function reduxRender(
     children: PropTypes.element.isRequired
   };
 
-  return render(ui, { wrapper: Wrapper, ...renderOptions });
+  return { store, ...render(ui, { wrapper: Wrapper, ...renderOptions }) };
 }
 
 const customRender = (ui, options) =>