remove asynchronousity

elastic · Mar 3, 2025 · 230f070 · 230f070
1 parent e140913
commit 230f070
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 47 deletions.
diff --git a/...ns/shared/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx b/...ns/shared/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
@@ -701,7 +701,7 @@ describe('LayerPanel', () => {
         target.columnId !== 'a' ? { dropTypes: ['field_replace'], nextLabel: '' } : undefined
       );
 
-      const { instance } = await mountWithReduxStore(
+      const { instance } = mountWithReduxStore(
         <ChildDragDropProvider value={createMockedDragDropContext({ dragging: draggingField })}>
           <LayerPanel {...getDefaultProps()} />
         </ChildDragDropProvider>
@@ -760,7 +760,7 @@ describe('LayerPanel', () => {
         nextLabel: '',
       });
 
-      const { instance } = await mountWithReduxStore(
+      const { instance } = mountWithReduxStore(
         <ChildDragDropProvider value={createMockedDragDropContext({ dragging: draggingOperation })}>
           <LayerPanel {...getDefaultProps()} />
         </ChildDragDropProvider>
@@ -820,7 +820,7 @@ describe('LayerPanel', () => {
       const holder = document.createElement('div');
       document.body.appendChild(holder);
 
-      const { instance } = await mountWithReduxStore(
+      const { instance } = mountWithReduxStore(
         <ChildDragDropProvider value={createMockedDragDropContext({ dragging: draggingOperation })}>
           <LayerPanel {...getDefaultProps()} />
         </ChildDragDropProvider>,
@@ -858,7 +858,7 @@ describe('LayerPanel', () => {
         ],
       });
 
-      const { instance } = await mountWithReduxStore(
+      const { instance } = mountWithReduxStore(
         <ChildDragDropProvider value={createMockedDragDropContext({ dragging: draggingOperation })}>
           <LayerPanel {...getDefaultProps()} />
         </ChildDragDropProvider>
@@ -895,7 +895,7 @@ describe('LayerPanel', () => {
         ],
       });
 
-      const { instance } = await mountWithReduxStore(
+      const { instance } = mountWithReduxStore(
         <ChildDragDropProvider value={createMockedDragDropContext({ dragging: draggingOperation })}>
           <LayerPanel {...getDefaultProps()} activeVisualization={mockVis} />
         </ChildDragDropProvider>
@@ -936,7 +936,7 @@ describe('LayerPanel', () => {
       mockDatasource.onDrop.mockReturnValue(true);
       const updateVisualization = jest.fn();
 
-      const { instance } = await mountWithReduxStore(
+      const { instance } = mountWithReduxStore(
         <ChildDragDropProvider value={createMockedDragDropContext({ dragging: draggingOperation })}>
           <LayerPanel
             {...getDefaultProps()}
@@ -987,7 +987,7 @@ describe('LayerPanel', () => {
       mockDatasource.onDrop.mockReturnValue(false);
       const updateVisualization = jest.fn();
 
-      const { instance } = await mountWithReduxStore(
+      const { instance } = mountWithReduxStore(
         <ChildDragDropProvider value={createMockedDragDropContext({ dragging: draggingOperation })}>
           <LayerPanel
             {...getDefaultProps()}
@@ -1027,7 +1027,7 @@ describe('LayerPanel', () => {
 
       mockDatasource.onDrop.mockReturnValue(true);
 
-      const { instance } = await mountWithReduxStore(
+      const { instance } = mountWithReduxStore(
         <ChildDragDropProvider value={createMockedDragDropContext({ dragging: draggingOperation })}>
           <LayerPanel {...getDefaultProps()} />
         </ChildDragDropProvider>

diff --git a/...rm/plugins/shared/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx b/...rm/plugins/shared/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx
@@ -116,7 +116,7 @@ describe('suggestion_panel', () => {
   });
 
   it('should avoid completely to render SuggestionPanel when in fullscreen mode', async () => {
-    const { instance, lensStore } = await mountWithReduxStore(
+    const { instance, lensStore } = mountWithReduxStore(
       <SuggestionPanelWrapper {...defaultProps} />
     );
     expect(instance.find(SuggestionPanel).exists()).toBe(true);
@@ -131,7 +131,7 @@ describe('suggestion_panel', () => {
   });
 
   it('should display apply-changes prompt when changes not applied', async () => {
-    const { instance, lensStore } = await mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
+    const { instance, lensStore } = mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
       preloadedState: {
         ...preloadedState,
         visualization: {
@@ -163,7 +163,7 @@ describe('suggestion_panel', () => {
   });
 
   it('should list passed in suggestions', async () => {
-    const { instance } = await mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
+    const { instance } = mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
       preloadedState,
     });
 
@@ -199,21 +199,19 @@ describe('suggestion_panel', () => {
     });
 
     it('should not update suggestions if current state is moved to staged preview', async () => {
-      const { instance, lensStore } = await mountWithReduxStore(
-        <SuggestionPanel {...defaultProps} />,
-        { preloadedState }
-      );
+      const { instance, lensStore } = mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
+        preloadedState,
+      });
       getSuggestionsMock.mockClear();
       lensStore.dispatch(setState({ stagedPreview }));
       instance.update();
       expect(getSuggestionsMock).not.toHaveBeenCalled();
     });
 
     it('should update suggestions if staged preview is removed', async () => {
-      const { instance, lensStore } = await mountWithReduxStore(
-        <SuggestionPanel {...defaultProps} />,
-        { preloadedState }
-      );
+      const { instance, lensStore } = mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
+        preloadedState,
+      });
       getSuggestionsMock.mockClear();
       lensStore.dispatch(setState({ stagedPreview, ...suggestionState }));
       instance.update();
@@ -234,9 +232,7 @@ describe('suggestion_panel', () => {
     });
 
     it('should rollback suggestion if current panel is clicked', async () => {
-      const { instance, lensStore } = await mountWithReduxStore(
-        <SuggestionPanel {...defaultProps} />
-      );
+      const { instance, lensStore } = mountWithReduxStore(<SuggestionPanel {...defaultProps} />);
 
       act(() => {
         instance.find(SELECTORS.SUGGESTION_TILE_BUTTON).at(2).simulate('click');
@@ -261,7 +257,7 @@ describe('suggestion_panel', () => {
   });
 
   it('should dispatch visualization switch action if suggestion is clicked', async () => {
-    const { instance, lensStore } = await mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
+    const { instance, lensStore } = mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
       preloadedState,
     });
 
@@ -315,7 +311,7 @@ describe('suggestion_panel', () => {
 
     mockDatasource.toExpression.mockReturnValue('datasource_expression');
 
-    const { instance } = await mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
+    const { instance } = mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
       preloadedState,
     });
 
@@ -343,14 +339,14 @@ describe('suggestion_panel', () => {
       },
     };
 
-    const { instance } = await mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
+    const { instance } = mountWithReduxStore(<SuggestionPanel {...defaultProps} />, {
       preloadedState: newPreloadedState,
     });
     expect(instance.html()).toEqual(null);
   });
 
   it('should hide the selections when the accordion is hidden', async () => {
-    const { instance } = await mountWithReduxStore(<SuggestionPanel {...defaultProps} />);
+    const { instance } = mountWithReduxStore(<SuggestionPanel {...defaultProps} />);
     expect(instance.find(EuiAccordion)).toHaveLength(1);
     act(() => {
       instance.find(EuiAccordion).at(0).simulate('change');

diff --git a/...ed/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx b/...ed/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx
@@ -367,7 +367,7 @@ describe('workspace_panel', () => {
 
       const visualizationShowing = () => instance.exists(expressionRendererMock);
 
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...defaultProps}
           datasourceMap={{
@@ -431,7 +431,7 @@ describe('workspace_panel', () => {
       mockDatasource.getLayers.mockReturnValue(['first']);
       const props = defaultProps;
 
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...props}
           datasourceMap={{
@@ -467,7 +467,7 @@ describe('workspace_panel', () => {
       mockDatasource.getLayers.mockReturnValue(['first']);
       const props = defaultProps;
 
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...props}
           datasourceMap={{
@@ -505,7 +505,7 @@ describe('workspace_panel', () => {
       mockDatasource.getLayers.mockReturnValue(['first']);
       const props = defaultProps;
 
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...props}
           datasourceMap={{
@@ -540,7 +540,7 @@ describe('workspace_panel', () => {
       mockDatasource.toExpression.mockReturnValue('datasource');
       mockDatasource.getLayers.mockReturnValue(['table1']);
 
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...defaultProps}
           datasourceMap={{
@@ -585,7 +585,7 @@ describe('workspace_panel', () => {
 
       expressionRendererMock = jest.fn((_arg) => <span />);
 
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...defaultProps}
           datasourceMap={{
@@ -629,7 +629,7 @@ describe('workspace_panel', () => {
         .mockReturnValueOnce('datasource second');
 
       expressionRendererMock = jest.fn((_arg) => <span />);
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...defaultProps}
           datasourceMap={{
@@ -687,7 +687,7 @@ describe('workspace_panel', () => {
 
       const getUserMessages = jest.fn(() => messages);
 
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...defaultProps}
           getUserMessages={getUserMessages}
@@ -717,7 +717,7 @@ describe('workspace_panel', () => {
       let userMessages = [] as UserMessage[];
       const getUserMessageFn = jest.fn(() => userMessages);
 
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...defaultProps}
           getUserMessages={getUserMessageFn}
@@ -786,7 +786,7 @@ describe('workspace_panel', () => {
       const mockAddUserMessages = jest.fn(() => mockRemoveUserMessages);
       const mockGetUserMessages = jest.fn<UserMessage[], unknown[]>(() => []);
 
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...defaultProps}
           datasourceMap={{
@@ -814,7 +814,7 @@ describe('workspace_panel', () => {
         first: mockDatasource.publicAPIMock,
       };
 
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...defaultProps}
           datasourceMap={{
@@ -844,7 +844,7 @@ describe('workspace_panel', () => {
       framePublicAPI.datasourceLayers = {
         first: mockDatasource.publicAPIMock,
       };
-      const mounted = await mountWithReduxStore(
+      const mounted = mountWithReduxStore(
         <WorkspacePanel
           {...defaultProps}
           datasourceMap={{

diff --git a/x-pack/platform/plugins/shared/lens/public/mocks/store_mocks.tsx b/x-pack/platform/plugins/shared/lens/public/mocks/store_mocks.tsx
@@ -100,7 +100,7 @@ export function makeLensStore({
 }: {
   storeDeps?: LensStoreDeps;
   preloadedState?: Partial<LensAppState>;
-}) {
+} = {}) {
   const data = storeDeps.lensServices.data;
   const store = makeConfigureStore(storeDeps, {
     lens: {
@@ -119,10 +119,10 @@ export function makeLensStore({
 export interface MountStoreProps {
   storeDeps?: LensStoreDeps;
   preloadedState?: Partial<LensAppState>;
-  dispatch?: jest.Mock;
 }
 
-export const mountWithReduxStore = async (
+// legacy enzyme usage: remove when all tests are migrated to @testing-library/react
+export const mountWithReduxStore = (
   component: React.ReactElement,
   store?: MountStoreProps,
   options?: {
@@ -131,12 +131,12 @@ export const mountWithReduxStore = async (
     attachTo?: HTMLElement;
   }
 ) => {
-  const { store: lensStore, deps } = makeLensStore(store || {});
+  const { store: lensStore, deps } = makeLensStore(store);
 
   let wrappingComponent: React.FC<PropsWithChildren<{}>> = ({ children }) => (
     <Provider store={lensStore}>{children}</Provider>
   );
- if (options?.wrappingComponent) {
+  if (options?.wrappingComponent) {
     wrappingComponent = ({ children }) => {
       return options?.wrappingComponent?.({
         ...options?.wrappingComponentProps,
@@ -146,9 +146,9 @@ export const mountWithReduxStore = async (
   }
 
   const instance = mountWithProviders(component, {
-      ...options,
-      wrappingComponent,
-    } as unknown as ReactWrapper);
+    ...options,
+    wrappingComponent,
+  } as unknown as ReactWrapper);
 
   return { instance, lensStore, deps };
 };
diff --git a/x-pack/platform/plugins/shared/lens/public/state_management/lens_slice.test.ts b/x-pack/platform/plugins/shared/lens/public/state_management/lens_slice.test.ts
@@ -37,7 +37,7 @@ import { layerTypes } from '../../common/layer_types';
 describe('lensSlice', () => {
   let store: EnhancedStore<{ lens: LensAppState }>;
   beforeEach(() => {
-    store = makeLensStore({}).store;
+    store = makeLensStore().store;
     jest.clearAllMocks();
   });
   const customQuery = { query: 'custom' } as Query;

diff --git a/x-pack/platform/plugins/shared/lens/public/test_utils/test_utils.tsx b/x-pack/platform/plugins/shared/lens/public/test_utils/test_utils.tsx
@@ -41,6 +41,7 @@ export const renderWithProviders = (
   return rtlRender;
 };
 
+// legacy enzyme usage: remove when all tests are migrated to @testing-library/react
 export const mountWithProviders = (component: React.ReactElement, options?: MountRendererProps) => {
   const { wrappingComponent, wrappingComponentProps } = options || {};