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
index 7564c246513de..bc0da84133e68 100644
--- 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
index fbf56bd235789..1e998f9798e97 100644
--- 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/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx
index 3b87c786d0e36..88b42c506dabc 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx
+++ b/x-pack/plugins/security_solution/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
index 9925b35616c91..79e91fdeb813a 100644
--- 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/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx
index 5c19a10307608..e9e9195b819d3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx
+++ b/x-pack/plugins/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(() => {
}
- description={
-
+ description={false}
+ >
+
+
@@ -59,7 +69,7 @@ export const LockedPolicyCard = memo(() => {
@@ -73,9 +83,9 @@ export const LockedPolicyCard = memo(() => {
/>
-
- }
- />
+
+
+
);
});
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
index 6713be176586c..68b4f2e4a0c31 100644
--- 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;
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
index 5ae5237421b54..e62b19ce599f6 100644
--- 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
index 71ab7f01ddd54..15b2b33409707 100644
--- 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
index e7422e32805a9..ee2ce8cf8103b 100644
--- 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(() => ({}));