Skip to content

Improve Redux test utilities #2329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raclim merged 4 commits into from
Aug 10, 2023
Merged

Improve Redux test utilities #2329

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02da46a
Improve Redux test utilities.
lindapaiste Jul 26, 2023
d543f2c
Merge branch 'develop' into feature/redux-test
lindapaiste Aug 3, 2023
37fb7d0
Merge branch 'develop' into feature/redux-test
lindapaiste Aug 5, 2023
8a8dc32
Merge branch 'develop' into feature/redux-test
lindapaiste Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions client/test-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { I18nextProvider } from 'react-i18next';
import { ThemeProvider as StyledThemeProvider } from 'styled-components';

import browserHistory from './browserHistory';
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';

// re-export everything
Expand All @@ -45,11 +44,7 @@ Providers.propTypes = {

function reduxRender(
ui,
{
initialState,
store = createStore(rootReducer, initialState),
...renderOptions
} = {}
{ initialState, store = configureStore(initialState), ...renderOptions } = {}
) {
function Wrapper({ children }) {
return (
Expand All @@ -67,7 +62,7 @@ function reduxRender(
children: PropTypes.element.isRequired
};

return render(ui, { wrapper: Wrapper, ...renderOptions });
return { store, ...render(ui, { wrapper: Wrapper, ...renderOptions }) };
}

const customRender = (ui, options) =>
Expand Down