moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rootState type in tests

This commit is contained in:
Alex Gleason 2022-07-06 15:25:07 -05:00
parent 06d3f00170
commit 8da7b8fe7a
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/soapbox/jest/test-helpers.tsx
View File

@ -1,6 +1,6 @@
import { configureMockStore } from '@jedmao/redux-mock-store'; import { configureMockStore } from '@jedmao/redux-mock-store';
import { render, RenderOptions } from '@testing-library/react'; import { render, RenderOptions } from '@testing-library/react';
import { merge } from 'immutable'; import { merge, Record as ImmutableRecord } from 'immutable';
import React, { FC, ReactElement } from 'react'; import React, { FC, ReactElement } from 'react';
import { IntlProvider } from 'react-intl'; import { IntlProvider } from 'react-intl';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
@ -17,7 +17,8 @@ import type { AppDispatch } from 'soapbox/store';
// Mock Redux // Mock Redux
// https://redux.js.org/recipes/writing-tests/ // https://redux.js.org/recipes/writing-tests/
let rootState = rootReducer(undefined, {} as Action); const gg = rootReducer(undefined, {} as Action);
const rootState = gg as unknown as ImmutableRecord<typeof gg>;
const mockStore = configureMockStore<typeof rootState, AnyAction, AppDispatch>([thunk]); const mockStore = configureMockStore<typeof rootState, AnyAction, AppDispatch>([thunk]);
/** Apply actions to the state, one at a time. */ /** Apply actions to the state, one at a time. */
@ -29,12 +30,13 @@ const createTestStore = (initialState: any) => createStore(rootReducer, initialS
const TestApp: FC<any> = ({ children, storeProps, routerProps = {} }) => { const TestApp: FC<any> = ({ children, storeProps, routerProps = {} }) => {
let store: any; let store: any;
let appState = rootState;
if (storeProps) { if (storeProps) {
rootState = merge(rootState, storeProps); appState = merge(rootState, storeProps);
store = createTestStore(rootState); store = createTestStore(appState);
} else { } else {
store = createTestStore(rootState); store = createTestStore(appState);
} }
const props = { const props = {