Skip to content

Commit

Permalink
* added a ts-expect-error and TODO in `x-pack/plugins/security_so…
Browse files Browse the repository at this point in the history
…lution/public/common/store/store.ts`
  • Loading branch information
andrew-goldstein committed Jul 14, 2020
1 parent cffe3fa commit 00ec93a
Show file tree
Hide file tree
Showing 25 changed files with 67 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import React from 'react';
import { mount } from 'enzyme';

import '../../../common/mock/match_media';
import { ExternalServiceColumn } from './columns';

import '../../../common/mock/match_media';
import { useGetCasesMockState } from '../../containers/mock';

describe('ExternalServiceColumn ', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import React from 'react';
import { mount } from 'enzyme';
import moment from 'moment-timezone';

import '../../../common/mock/match_media';
import { AllCases } from '.';
import { TestProviders } from '../../../common/mock';
import { useGetCasesMockState } from '../../containers/mock';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import React from 'react';
import { mount } from 'enzyme';

import '../../../common/mock/match_media';
import { Router, routeData, mockHistory, mockLocation } from '../__mock__/router';
import { CaseComponent, CaseProps, CaseView } from '.';
import { basicCase, basicCaseClosed, caseUserActions } from '../../containers/mock';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import React from 'react';
import { MockedProvider } from 'react-apollo/test-utils';
import useResizeObserver from 'use-resize-observer/polyfilled';

import '../../mock/match_media';
import { wait } from '../../lib/helpers';
import { mockIndexPattern, TestProviders } from '../../mock';
import { useMountAppended } from '../../utils/use_mount_appended';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import { shallow } from 'enzyme';
import { cloneDeep } from 'lodash/fp';
import React from 'react';

import '../../../mock/match_media';
import { AnomalyScoreComponent } from './anomaly_score';
import { mockAnomalies } from '../mock';
import { TestProviders } from '../../../mock/test_providers';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
import React from 'react';
import { cloneDeep } from 'lodash/fp';
import { shallow } from 'enzyme';
import { DraggableScoreComponent } from './draggable_score';

import '../../../mock/match_media';
import { DraggableScoreComponent } from './draggable_score';
import { mockAnomalies } from '../mock';

describe('draggable_score', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import { mount, ReactWrapper } from 'enzyme';
import React from 'react';

import '../../mock/match_media';
import { mockBrowserFields } from '../../containers/source/mock';
import {
apolloClientObservable,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ export const createStore = (
)
);

epicMiddleware.run(createRootEpic<State>());
// @ts-expect-error
epicMiddleware.run(createRootEpic<State>()); // TODO: the addition of fullScreen should not cause this error

return store;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import React from 'react';
import { shallow } from 'enzyme';

import '../../../common/mock/match_media';
import { AlertsHistogram } from './alerts_histogram';

import '../../../common/mock/match_media';
jest.mock('../../../common/lib/kibana');

describe('AlertsHistogram', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import React from 'react';
import { shallow } from 'enzyme';

import '../../../common/mock/match_media';
import { DetectionEngineHeaderPage } from './index';

describe('detection_engine_header_page', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
*/

import React from 'react';
import { shallow } from 'enzyme';
import { mount } from 'enzyme';
import { useParams } from 'react-router-dom';

import '../../../common/mock/match_media';
import {
apolloClientObservable,
createSecuritySolutionStorageMock,
Expand All @@ -16,13 +17,21 @@ import {
TestProviders,
SUB_PLUGINS_REDUCER,
} from '../../../common/mock';
import '../../../common/mock/match_media';
import { setAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions';
import { DetectionEnginePageComponent } from './detection_engine';
import { useUserInfo } from '../../components/user_info';
import { useWithSource } from '../../../common/containers/source';
import { createStore, State } from '../../../common/store';
import { mockHistory, Router } from '../../../cases/components/__mock__/router';

// Test will fail because we will to need to mock some core services to make the test work
// For now let's forget about SiemSearchBar and QueryBar
jest.mock('../../../common/components/search_bar', () => ({
SiemSearchBar: () => null,
}));
jest.mock('../../../common/components/query_bar', () => ({
QueryBar: () => null,
}));
jest.mock('../../containers/detection_engine/lists/use_lists_config');
jest.mock('../../components/user_info');
jest.mock('../../../common/containers/source');
Expand Down Expand Up @@ -66,16 +75,18 @@ describe('DetectionEnginePageComponent', () => {
});

it('renders correctly', () => {
const wrapper = shallow(
const wrapper = mount(
<TestProviders store={store}>
<DetectionEnginePageComponent
query={{ query: 'query', language: 'language' }}
filters={[]}
setAbsoluteRangeDatePicker={setAbsoluteRangeDatePicker}
/>
<Router history={mockHistory}>
<DetectionEnginePageComponent
query={{ query: 'query', language: 'language' }}
filters={[]}
setAbsoluteRangeDatePicker={setAbsoluteRangeDatePicker}
/>
</Router>
</TestProviders>
);

expect(wrapper.find('FiltersGlobal')).toHaveLength(1);
expect(wrapper.find('FiltersGlobal').exists()).toBe(true);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { createMemoryHistory } from 'history';

const history = createMemoryHistory();

import '../../../../../common/mock/match_media';
import { mockRule } from './__mocks__/mock';
import { getActions } from './columns';
import '../../../../../common/mock/match_media';

jest.mock('./actions', () => ({
duplicateRulesAction: jest.fn(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import React from 'react';
import { shallow } from 'enzyme';
import { mount } from 'enzyme';

import '../../../../../common/mock/match_media';
import {
Expand All @@ -22,7 +22,16 @@ import { setAbsoluteRangeDatePicker } from '../../../../../common/store/inputs/a
import { useUserInfo } from '../../../../components/user_info';
import { useWithSource } from '../../../../../common/containers/source';
import { useParams } from 'react-router-dom';
import { mockHistory, Router } from '../../../../../cases/components/__mock__/router';

// Test will fail because we will to need to mock some core services to make the test work
// For now let's forget about SiemSearchBar and QueryBar
jest.mock('../../../../../common/components/search_bar', () => ({
SiemSearchBar: () => null,
}));
jest.mock('../../../../../common/components/query_bar', () => ({
QueryBar: () => null,
}));
jest.mock('../../../../containers/detection_engine/lists/use_lists_config');
jest.mock('../../../../../common/components/link_to');
jest.mock('../../../../components/user_info');
Expand Down Expand Up @@ -66,19 +75,21 @@ describe('RuleDetailsPageComponent', () => {
});

it('renders correctly', () => {
const wrapper = shallow(
const wrapper = mount(
<TestProviders store={store}>
<RuleDetailsPageComponent
query={{ query: '', language: 'language' }}
filters={[]}
setAbsoluteRangeDatePicker={setAbsoluteRangeDatePicker}
/>
<Router history={mockHistory}>
<RuleDetailsPageComponent
query={{ query: '', language: 'language' }}
filters={[]}
setAbsoluteRangeDatePicker={setAbsoluteRangeDatePicker}
/>
</Router>
</TestProviders>,
{
wrappingComponent: TestProviders,
}
);

expect(wrapper.find('DetectionEngineHeaderPage')).toHaveLength(1);
expect(wrapper.find('[data-test-subj="header-page-title"]').exists()).toBe(true);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
import React from 'react';
import { shallow } from 'enzyme';

import '../../../../../common/mock/match_media';
import { TestProviders } from '../../../../../common/mock';
import { EditRulePage } from './index';
import { useUserInfo } from '../../../../components/user_info';
import { useParams } from 'react-router-dom';

import '../../../../../common/mock/match_media';
jest.mock('../../../../containers/detection_engine/lists/use_lists_config');
jest.mock('../../../../../common/components/link_to');
jest.mock('../../../../components/user_info');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { getOr } from 'lodash/fp';
import React from 'react';

import { TestProviders } from '../../../common/mock';
import '../../../common/mock/match_media';
import { hostsModel } from '../../store';
import { getEmptyValue } from '../../../common/components/empty_value';
import { useMountAppended } from '../../../common/utils/use_mount_appended';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@

import { shallow } from 'enzyme';
import React from 'react';

import '../../../../common/mock/match_media';
import { getRenderedFieldValue, PointToolTipContentComponent } from './point_tool_tip_content';
import { TestProviders } from '../../../../common/mock';
import '../../../../common/mock/match_media';
import { getEmptyStringTag } from '../../../../common/components/empty_value';
import { HostDetailsLink, IPDetailsLink } from '../../../../common/components/links';
import { FlowTarget } from '../../../../graphql/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import React from 'react';

import { asArrayIfExists } from '../../../common/lib/helpers';
import { getMockNetflowData } from '../../../common/mock';
import '../../../common/mock/match_media';
import { TestProviders } from '../../../common/mock/test_providers';
import { ID_FIELD_NAME } from '../../../common/components/event_details/event_id';
import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../ip';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { shallow } from 'enzyme';

import { asArrayIfExists } from '../../../common/lib/helpers';
import { getMockNetflowData } from '../../../common/mock';
import '../../../common/mock/match_media';
import { TestProviders } from '../../../common/mock/test_providers';
import {
TLS_CLIENT_CERTIFICATE_FINGERPRINT_SHA1_FIELD_NAME,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import { shallow } from 'enzyme';
import React from 'react';

import '../../../../../../common/mock/match_media';
import { BrowserFields } from '../../../../../../common/containers/source';
import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import React from 'react';

import { TestProviders } from '../../../../../../common/mock';

import '../../../../../../common/mock/match_media';
import { DnsRequestEventDetailsLine } from './dns_request_event_details_line';
import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import React from 'react';

import { TimelineNonEcsData } from '../../../../../graphql/types';
import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../../common/mock';
import '../../../../../common/mock/match_media';
import { useMountAppended } from '../../../../../common/utils/use_mount_appended';
import { getEmptyValue } from '../../../../../common/components/empty_value';
import { deleteItemIdx, findItem } from './helpers';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import React from 'react';

import { TestProviders } from '../../../../../common/mock';
import '../../../../../common/mock/match_media';
import { useMountAppended } from '../../../../../common/utils/use_mount_appended';

import { ExitCodeDraggable } from './exit_code_draggable';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import { shallow } from 'enzyme';
import React from 'react';

import '../../../../../common/mock/match_media';
import { mockTimelineData, TestProviders } from '../../../../../common/mock';
import { useMountAppended } from '../../../../../common/utils/use_mount_appended';
import { HostWorkingDir } from './host_working_dir';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import React from 'react';

import { TestProviders } from '../../../../../common/mock';
import '../../../../../common/mock/match_media';
import { useMountAppended } from '../../../../../common/utils/use_mount_appended';

import { ProcessHash } from './process_hash';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import React from 'react';
import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
import { Ecs } from '../../../../../../graphql/types';
import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
import '../../../../../../common/mock/match_media';
import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
import { zeekRowRenderer } from './zeek_row_renderer';

Expand Down

0 comments on commit 00ec93a

Please sign in to comment.