[Security Solution] Clearing up all jest errors and warnings (elastic…

…#91740)
Kerry350 · Feb 19, 2021 · fc77586 · fc77586
1 parent fb2f6ab
commit fc77586
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 28 deletions.
diff --git a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/index.ts
@@ -6,13 +6,16 @@
  */
 
 import {
+  EuiMarkdownEditorUiPlugin,
   getDefaultEuiMarkdownParsingPlugins,
   getDefaultEuiMarkdownProcessingPlugins,
+  getDefaultEuiMarkdownUiPlugins,
 } from '@elastic/eui';
 
 import * as timelineMarkdownPlugin from './timeline';
-
-export const uiPlugins = [timelineMarkdownPlugin.plugin];
+const uiPlugins: EuiMarkdownEditorUiPlugin[] = getDefaultEuiMarkdownUiPlugins();
+uiPlugins.push(timelineMarkdownPlugin.plugin);
+export { uiPlugins };
 export const parsingPlugins = getDefaultEuiMarkdownParsingPlugins();
 export const processingPlugins = getDefaultEuiMarkdownProcessingPlugins();
 

diff --git a/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
@@ -34,7 +34,16 @@ describe('QueryBar ', () => {
     await waitFor(() => getByTestId('queryInput')); // check for presence of query input
     return mount(Component);
   };
+  let abortSpy: jest.SpyInstance;
+  beforeAll(() => {
+    const mockAbort = new AbortController();
+    mockAbort.abort();
+    abortSpy = jest.spyOn(window, 'AbortController').mockImplementation(() => mockAbort);
+  });
 
+  afterAll(() => {
+    abortSpy.mockRestore();
+  });
   beforeEach(() => {
     mockOnChangeQuery.mockClear();
     mockOnSubmitQuery.mockClear();
@@ -264,7 +273,6 @@ describe('QueryBar ', () => {
       const onChangedQueryRef = searchBarProps.onQueryChange;
       const onSubmitQueryRef = searchBarProps.onQuerySubmit;
       const onSavedQueryRef = searchBarProps.onSavedQueryUpdated;
-
       wrapper.setProps({ onSavedQuery: jest.fn() });
       wrapper.update();
 
@@ -294,22 +302,21 @@ describe('QueryBar ', () => {
           onSavedQuery={mockOnSavedQuery}
         />
       );
-      await waitFor(() => {
-        const isSavedQueryPopoverOpen = () =>
-          wrapper.find('EuiPopover[id="savedQueryPopover"]').prop('isOpen');
+      const isSavedQueryPopoverOpen = () =>
+        wrapper.find('EuiPopover[id="savedQueryPopover"]').prop('isOpen');
 
-        expect(isSavedQueryPopoverOpen()).toBeFalsy();
+      expect(isSavedQueryPopoverOpen()).toBeFalsy();
 
-        wrapper
-          .find('button[data-test-subj="saved-query-management-popover-button"]')
-          .simulate('click');
+      wrapper
+        .find('button[data-test-subj="saved-query-management-popover-button"]')
+        .simulate('click');
 
+      await waitFor(() => {
         expect(isSavedQueryPopoverOpen()).toBeTruthy();
+      });
+      wrapper.find('button[data-test-subj="saved-query-management-save-button"]').simulate('click');
 
-        wrapper
-          .find('button[data-test-subj="saved-query-management-save-button"]')
-          .simulate('click');
-
+      await waitFor(() => {
         expect(isSavedQueryPopoverOpen()).toBeFalsy();
       });
     });

diff --git a/...n/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx b/...n/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx
@@ -20,7 +20,15 @@ import { useAllExceptionLists } from './use_all_exception_lists';
 jest.mock('../../../../../../common/lib/kibana');
 jest.mock('./use_all_exception_lists');
 jest.mock('../../../../../../shared_imports');
+jest.mock('@kbn/i18n/react', () => {
+  const originalModule = jest.requireActual('@kbn/i18n/react');
+  const FormattedRelative = jest.fn().mockImplementation(() => '20 hours ago');
 
+  return {
+    ...originalModule,
+    FormattedRelative,
+  };
+});
 describe('ExceptionListsTable', () => {
   const exceptionList1 = getExceptionListSchemaMock();
   const exceptionList2 = { ...getExceptionListSchemaMock(), list_id: 'not_endpoint_list', id: '2' };

diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
@@ -54,6 +54,16 @@ describe('when on the list page', () => {
   let store: AppContextTestRender['store'];
   let coreStart: AppContextTestRender['coreStart'];
   let middlewareSpy: AppContextTestRender['middlewareSpy'];
+  let abortSpy: jest.SpyInstance;
+  beforeAll(() => {
+    const mockAbort = new AbortController();
+    mockAbort.abort();
+    abortSpy = jest.spyOn(window, 'AbortController').mockImplementation(() => mockAbort);
+  });
+
+  afterAll(() => {
+    abortSpy.mockRestore();
+  });
   beforeEach(() => {
     const mockedContext = createAppRootMockRenderer();
     ({ history, store, coreStart, middlewareSpy } = mockedContext);

diff --git a/...lugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx b/...lugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx
@@ -6,7 +6,15 @@
  */
 
 import React, { memo } from 'react';
-import { EuiCard, EuiIcon, EuiTextColor, EuiLink, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import {
+  EuiCard,
+  EuiIcon,
+  EuiTextColor,
+  EuiLink,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiText,
+} from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
@@ -42,8 +50,10 @@ export const LockedPolicyCard = memo(() => {
             </strong>
           </h3>
         }
-        description={
-          <EuiFlexGroup className="lockedCardDescription" direction="column" gutterSize="none">
+        description={false}
+      >
+        <EuiFlexGroup className="lockedCardDescription" direction="column" gutterSize="none">
+          <EuiText>
             <EuiFlexItem>
               <h4>
                 <EuiTextColor color="subdued">
@@ -59,7 +69,7 @@ export const LockedPolicyCard = memo(() => {
                 <FormattedMessage
                   id="xpack.securitySolution.endpoint.policy.details.lockedCard"
                   defaultMessage="To turn on Ransomware protection, you must upgrade your license to Platinum, start a
-            free 30-day trial, or spin up a {cloudDeploymentLink} on AWS, GCP, or Azure."
+              free 30-day trial, or spin up a {cloudDeploymentLink} on AWS, GCP, or Azure."
                   values={{
                     cloudDeploymentLink: (
                       <EuiLink href="https://www.elastic.co/cloud/" target="_blank">
@@ -73,9 +83,9 @@ export const LockedPolicyCard = memo(() => {
                 />
               </p>
             </EuiFlexItem>
-          </EuiFlexGroup>
-        }
-      />
+          </EuiText>
+        </EuiFlexGroup>
+      </EuiCard>
     </LockedPolicyDiv>
   );
 });

diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.test.tsx
@@ -26,7 +26,15 @@ jest.mock('../../../containers/kpis', () => ({
 }));
 const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 jest.mock('../../../../common/lib/kibana');
+jest.mock('@kbn/i18n/react', () => {
+  const originalModule = jest.requireActual('@kbn/i18n/react');
+  const FormattedRelative = jest.fn().mockImplementation(() => '20 hours ago');
 
+  return {
+    ...originalModule,
+    FormattedRelative,
+  };
+});
 const mockUseTimelineKpiResponse = {
   processCount: 1,
   userCount: 1,

diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
@@ -9,11 +9,7 @@ import { cloneDeep, getOr, omit } from 'lodash/fp';
 import { Dispatch } from 'redux';
 import ApolloClient from 'apollo-client';
 
-import {
-  mockTimelineResults,
-  mockTimelineResult,
-  mockTimelineModel,
-} from '../../../common/mock/timeline_results';
+import { mockTimelineResults, mockTimelineResult, mockTimelineModel } from '../../../common/mock';
 import { timelineDefaults } from '../../store/timeline/defaults';
 import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../../common/store/inputs/actions';
 import {
@@ -37,7 +33,7 @@ import {
   formatTimelineResultToModel,
 } from './helpers';
 import { OpenTimelineResult, DispatchUpdateTimeline } from './types';
-import { KueryFilterQueryKind } from '../../../common/store/model';
+import { KueryFilterQueryKind } from '../../../common/store';
 import { Note } from '../../../common/lib/note';
 import moment from 'moment';
 import sinon from 'sinon';
@@ -1275,7 +1271,7 @@ describe('helpers', () => {
 
     describe('update a timeline', () => {
       const updateIsLoading = jest.fn();
-      const updateTimeline = jest.fn();
+      const updateTimeline = jest.fn().mockImplementation(() => jest.fn());
       const selectedTimeline = { ...mockSelectedTimeline };
       const apolloClient = {
         query: (jest.fn().mockResolvedValue(selectedTimeline) as unknown) as ApolloClient<{}>,
@@ -1316,6 +1312,7 @@ describe('helpers', () => {
           args.duplicate,
           args.timelineType
         );
+
         expect(updateTimeline).toBeCalledWith({
           timeline: {
             ...timeline,

diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.test.tsx
@@ -21,6 +21,14 @@ import { createStore, State } from '../../../common/store';
 import { DetailsPanel } from './index';
 import { TimelineExpandedDetail, TimelineTabs } from '../../../../common/types/timeline';
 import { FlowTarget } from '../../../../common/search_strategy/security_solution/network';
+jest.mock('react-apollo', () => {
+  const original = jest.requireActual('react-apollo');
+  return {
+    ...original,
+    // eslint-disable-next-line react/display-name
+    Query: () => <></>,
+  };
+});
 
 describe('Details Panel Component', () => {
   const state: State = { ...mockGlobalState };

diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx
@@ -25,7 +25,15 @@ jest.mock('../../containers/index', () => ({
 
 jest.mock('../../../common/lib/kibana');
 jest.mock('../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('@kbn/i18n/react', () => {
+  const originalModule = jest.requireActual('@kbn/i18n/react');
+  const FormattedRelative = jest.fn().mockImplementation(() => '20 hours ago');
 
+  return {
+    ...originalModule,
+    FormattedRelative,
+  };
+});
 const mockUseResizeObserver: jest.Mock = useResizeObserver as jest.Mock;
 jest.mock('use-resize-observer/polyfilled');
 mockUseResizeObserver.mockImplementation(() => ({}));