refactor: remove KibanaRenderContextProvider and update test setup

- Removed KibanaRenderContextProvider from TestProvidersComponent due to issues in current overview tests - Updated test setup in data_quality.test.tsx to include KibanaRenderContextProvider instead
elastic · Jan 5, 2025 · 5ab5bfe · 5ab5bfe
1 parent fd9f900
commit 5ab5bfe
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 62 deletions.
diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/mock/test_providers.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/mock/test_providers.tsx
@@ -17,8 +17,6 @@ import { ThemeProvider } from 'styled-components';
 import type { Capabilities } from '@kbn/core/public';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 
-import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
-import { coreMock } from '@kbn/core/public/mocks';
 import type { Action } from '@kbn/ui-actions-plugin/public';
 import { CellActionsProvider } from '@kbn/cell-actions';
 import { TestProvider as ExpandableFlyoutTestProvider } from '@kbn/expandable-flyout/src/test/provider';
@@ -77,31 +75,29 @@ export const TestProvidersComponent = ({
 
   return (
     <MockKibanaContextProvider startServices={startServices}>
-      <KibanaRenderContextProvider {...coreMock.createStart()}>
-        <I18nProvider>
-          <UpsellingProviderMock>
-            <ReduxStoreProvider store={store}>
-              <ThemeProvider theme={() => ({ eui: euiDarkVars, darkMode: true })}>
-                <QueryClientProvider client={queryClient}>
-                  <MockDiscoverInTimelineContext>
-                    <MockAssistantProvider>
-                      <ExpandableFlyoutTestProvider>
-                        <ConsoleManager>
-                          <CellActionsProvider
-                            getTriggerCompatibleActions={() => Promise.resolve(cellActions)}
-                          >
-                            <DragDropContext onDragEnd={onDragEnd}>{children}</DragDropContext>
-                          </CellActionsProvider>
-                        </ConsoleManager>
-                      </ExpandableFlyoutTestProvider>
-                    </MockAssistantProvider>
-                  </MockDiscoverInTimelineContext>
-                </QueryClientProvider>
-              </ThemeProvider>
-            </ReduxStoreProvider>
-          </UpsellingProviderMock>
-        </I18nProvider>
-      </KibanaRenderContextProvider>
+      <I18nProvider>
+        <UpsellingProviderMock>
+          <ReduxStoreProvider store={store}>
+            <ThemeProvider theme={() => ({ eui: euiDarkVars, darkMode: true })}>
+              <QueryClientProvider client={queryClient}>
+                <MockDiscoverInTimelineContext>
+                  <MockAssistantProvider>
+                    <ExpandableFlyoutTestProvider>
+                      <ConsoleManager>
+                        <CellActionsProvider
+                          getTriggerCompatibleActions={() => Promise.resolve(cellActions)}
+                        >
+                          <DragDropContext onDragEnd={onDragEnd}>{children}</DragDropContext>
+                        </CellActionsProvider>
+                      </ConsoleManager>
+                    </ExpandableFlyoutTestProvider>
+                  </MockAssistantProvider>
+                </MockDiscoverInTimelineContext>
+              </QueryClientProvider>
+            </ThemeProvider>
+          </ReduxStoreProvider>
+        </UpsellingProviderMock>
+      </I18nProvider>
     </MockKibanaContextProvider>
   );
 };

diff --git a/.../solutions/security/plugins/security_solution/public/overview/pages/data_quality.test.tsx b/.../solutions/security/plugins/security_solution/public/overview/pages/data_quality.test.tsx
@@ -14,6 +14,7 @@ import { useKibana as mockUseKibana } from '../../common/lib/kibana/__mocks__';
 import { TestProviders } from '../../common/mock';
 import { DataQuality } from './data_quality';
 import { useKibana } from '../../common/lib/kibana';
+import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
 
 const mockedUseKibana = mockUseKibana();
 
@@ -104,11 +105,13 @@ describe('DataQuality', () => {
   describe('when indices exist, and loading is complete', () => {
     beforeEach(async () => {
       render(
-        <TestProviders>
-          <MemoryRouter>
-            <DataQuality />
-          </MemoryRouter>
-        </TestProviders>
+        <KibanaRenderContextProvider {...mockedUseKibana.services}>
+          <TestProviders>
+            <MemoryRouter>
+              <DataQuality />
+            </MemoryRouter>
+          </TestProviders>
+        </KibanaRenderContextProvider>
       );
 
       await waitFor(() => {});
@@ -136,11 +139,13 @@ describe('DataQuality', () => {
       mockUseSourcererDataView.mockReturnValue({ ...defaultUseSourcererReturn, loading: true });
 
       render(
-        <TestProviders>
-          <MemoryRouter>
-            <DataQuality />
-          </MemoryRouter>
-        </TestProviders>
+        <KibanaRenderContextProvider {...mockedUseKibana.services}>
+          <TestProviders>
+            <MemoryRouter>
+              <DataQuality />
+            </MemoryRouter>
+          </TestProviders>
+        </KibanaRenderContextProvider>
       );
 
       await waitFor(() => {});
@@ -168,11 +173,13 @@ describe('DataQuality', () => {
       mockUseSignalIndex.mockReturnValue({ ...defaultUseSignalIndexReturn, loading: true });
 
       render(
-        <TestProviders>
-          <MemoryRouter>
-            <DataQuality />
-          </MemoryRouter>
-        </TestProviders>
+        <KibanaRenderContextProvider {...mockedUseKibana.services}>
+          <TestProviders>
+            <MemoryRouter>
+              <DataQuality />
+            </MemoryRouter>
+          </TestProviders>
+        </KibanaRenderContextProvider>
       );
 
       await waitFor(() => {});
@@ -205,11 +212,13 @@ describe('DataQuality', () => {
       mockUseSignalIndex.mockReturnValue({ ...defaultUseSignalIndexReturn, loading: false });
 
       render(
-        <TestProviders>
-          <MemoryRouter>
-            <DataQuality />
-          </MemoryRouter>
-        </TestProviders>
+        <KibanaRenderContextProvider {...mockedUseKibana.services}>
+          <TestProviders>
+            <MemoryRouter>
+              <DataQuality />
+            </MemoryRouter>
+          </TestProviders>
+        </KibanaRenderContextProvider>
       );
 
       await waitFor(() => {});
@@ -242,11 +251,13 @@ describe('DataQuality', () => {
       mockUseSignalIndex.mockReturnValue({ ...defaultUseSignalIndexReturn, loading: false });
 
       render(
-        <TestProviders>
-          <MemoryRouter>
-            <DataQuality />
-          </MemoryRouter>
-        </TestProviders>
+        <KibanaRenderContextProvider {...mockedUseKibana.services}>
+          <TestProviders>
+            <MemoryRouter>
+              <DataQuality />
+            </MemoryRouter>
+          </TestProviders>
+        </KibanaRenderContextProvider>
       );
 
       await waitFor(() => {});
@@ -279,11 +290,13 @@ describe('DataQuality', () => {
       mockUseSignalIndex.mockReturnValue({ ...defaultUseSignalIndexReturn, loading: true });
 
       render(
-        <TestProviders>
-          <MemoryRouter>
-            <DataQuality />
-          </MemoryRouter>
-        </TestProviders>
+        <KibanaRenderContextProvider {...mockedUseKibana.services}>
+          <TestProviders>
+            <MemoryRouter>
+              <DataQuality />
+            </MemoryRouter>
+          </TestProviders>
+        </KibanaRenderContextProvider>
       );
 
       await waitFor(() => {});
@@ -335,11 +348,13 @@ describe('DataQuality', () => {
       });
 
       render(
-        <TestProviders>
-          <MemoryRouter>
-            <DataQuality />
-          </MemoryRouter>
-        </TestProviders>
+        <KibanaRenderContextProvider {...mockedUseKibana.services}>
+          <TestProviders>
+            <MemoryRouter>
+              <DataQuality />
+            </MemoryRouter>
+          </TestProviders>
+        </KibanaRenderContextProvider>
       );
 
       await waitFor(() => {});