rename storeWithApi by defaultStore

apache · May 8, 2023 · cc5324f · cc5324f
1 parent fc84787
commit cc5324f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 24 deletions.
diff --git a/superset-frontend/spec/helpers/testing-library.tsx b/superset-frontend/spec/helpers/testing-library.tsx
@@ -39,14 +39,19 @@ type Options = Omit<RenderOptions, 'queries'> & {
   store?: Store;
 };
 
-export const storeWithApi = configureStore({
-  reducer: {
-    [api.reducerPath]: api.reducer,
-  },
-  middleware: getDefaultMiddleware =>
-    getDefaultMiddleware().concat(api.middleware),
-  devTools: false,
-});
+const createStore = (initialState: object = {}, reducers: object = {}) =>
+  configureStore({
+    preloadedState: initialState,
+    reducer: {
+      ...reducers,
+      [api.reducerPath]: api.reducer,
+    },
+    middleware: getDefaultMiddleware =>
+      getDefaultMiddleware().concat(api.middleware),
+    devTools: false,
+  });
+
+export const defaultStore = createStore();
 
 export function createWrapper(options?: Options) {
   const {
@@ -70,17 +75,7 @@ export function createWrapper(options?: Options) {
 
     if (useRedux) {
       const mockStore =
-        store ??
-        configureStore({
-          preloadedState: initialState,
-          devTools: false,
-          reducer: {
-            ...(reducers || reducerIndex),
-            [api.reducerPath]: api.reducer,
-          },
-          middleware: getDefaultMiddleware =>
-            getDefaultMiddleware().concat(api.middleware),
-        });
+        store ?? createStore(initialState, reducers || reducerIndex);
       result = <Provider store={mockStore}>{result}</Provider>;
     }
 

diff --git a/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx b/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
@@ -24,7 +24,7 @@ import {
   render,
   screen,
   waitFor,
-  storeWithApi as store,
+  defaultStore as store,
 } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
 import { api } from 'src/hooks/apiResources/queryApi';

diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx b/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx
@@ -25,7 +25,7 @@ import sinon from 'sinon';
 import { supersetTheme, ThemeProvider } from '@superset-ui/core';
 
 import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
-import { storeWithApi as store } from 'spec/helpers/testing-library';
+import { defaultStore as store } from 'spec/helpers/testing-library';
 import Modal from 'src/components/Modal';
 import { DatasourceModal } from 'src/components/Datasource';
 import DatasourceEditor from 'src/components/Datasource/DatasourceEditor';

diff --git a/superset-frontend/src/components/TableSelector/TableSelector.test.tsx b/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
@@ -24,7 +24,7 @@ import {
   screen,
   waitFor,
   within,
-  storeWithApi as store,
+  defaultStore as store,
 } from 'spec/helpers/testing-library';
 import { api } from 'src/hooks/apiResources/queryApi';
 import fetchMock from 'fetch-mock';

diff --git a/superset-frontend/src/hooks/apiResources/schemas.test.ts b/superset-frontend/src/hooks/apiResources/schemas.test.ts
@@ -21,7 +21,7 @@ import fetchMock from 'fetch-mock';
 import { act, renderHook } from '@testing-library/react-hooks';
 import {
   createWrapper,
-  storeWithApi as store,
+  defaultStore as store,
 } from 'spec/helpers/testing-library';
 import { api } from 'src/hooks/apiResources/queryApi';
 import { useSchemas } from './schemas';

diff --git a/superset-frontend/src/hooks/apiResources/tables.test.ts b/superset-frontend/src/hooks/apiResources/tables.test.ts
@@ -21,7 +21,7 @@ import fetchMock from 'fetch-mock';
 import { act, renderHook } from '@testing-library/react-hooks';
 import {
   createWrapper,
-  storeWithApi as store,
+  defaultStore as store,
 } from 'spec/helpers/testing-library';
 import { api } from 'src/hooks/apiResources/queryApi';
 import { useTables } from './tables';