Skip to content

Commit

Permalink
[Security Solution][Endpoint] Un-skip and fix tests for Response Acti…
Browse files Browse the repository at this point in the history 
…ons History Log (#154865)

## Summary

- Un-skips and fixes tests for the Response Actions History Log

Fixes: #153556
Fixes: #145635
  • Loading branch information
@paul-tavares
paul-tavares authored Apr 13, 2023
1 parent d6a8a88 commit 2d7fb43
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 34 deletions.
4 changes: 2 additions & 2 deletions ...lic/management/components/endpoint_execute_action/execute_action_host_response_output.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ const ExecutionActionOutputAccordion = memo<ExecuteActionOutputProps>(

const accordionButtonContent = useMemo(
() => (
<EuiText size={textSize}>
<EuiText size={textSize} data-test-subj={getTestId('title')}>
{type !== 'context'
? isTruncated
? ACCORDION_BUTTON_TEXT[type].truncated
: ACCORDION_BUTTON_TEXT[type].regular
: ACCORDION_BUTTON_TEXT[type]}
</EuiText>
),
[isTruncated, textSize, type]
[getTestId, isTruncated, textSize, type]
);

return (
Expand Down
74 changes: 42 additions & 32 deletions ...ctions_list/response_actions_log.test.tsx → ...ation_tests/response_actions_log.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,29 @@ import type { IHttpFetchError } from '@kbn/core-http-browser';
import {
createAppRootMockRenderer,
type AppContextTestRender,
} from '../../../common/mock/endpoint';
import { ResponseActionsLog } from './response_actions_log';
} from '../../../../common/mock/endpoint';
import { ResponseActionsLog } from '../response_actions_log';
import type {
ActionDetailsApiResponse,
ActionFileInfoApiResponse,
} from '../../../../common/endpoint/types';
import { MANAGEMENT_PATH } from '../../../../common/constants';
import { getActionListMock } from './mocks';
import { useGetEndpointsList } from '../../hooks/endpoint/use_get_endpoints_list';
} from '../../../../../common/endpoint/types';
import { MANAGEMENT_PATH } from '../../../../../common/constants';
import { getActionListMock } from '../mocks';
import { useGetEndpointsList } from '../../../hooks/endpoint/use_get_endpoints_list';
import { v4 as uuidv4 } from 'uuid';
import { RESPONSE_ACTION_API_COMMANDS_NAMES } from '../../../../common/endpoint/service/response_actions/constants';
import { useUserPrivileges as _useUserPrivileges } from '../../../common/components/user_privileges';
import { responseActionsHttpMocks } from '../../mocks/response_actions_http_mocks';
import { RESPONSE_ACTION_API_COMMANDS_NAMES } from '../../../../../common/endpoint/service/response_actions/constants';
import { useUserPrivileges as _useUserPrivileges } from '../../../../common/components/user_privileges';
import { responseActionsHttpMocks } from '../../../mocks/response_actions_http_mocks';
import { waitFor } from '@testing-library/react';
import { getEndpointAuthzInitialStateMock } from '../../../../common/endpoint/service/authz/mocks';
import { useGetEndpointActionList as _useGetEndpointActionList } from '../../hooks/response_actions/use_get_endpoint_action_list';
import { getEndpointAuthzInitialStateMock } from '../../../../../common/endpoint/service/authz/mocks';
import { useGetEndpointActionList as _useGetEndpointActionList } from '../../../hooks/response_actions/use_get_endpoint_action_list';

const useGetEndpointActionListMock = _useGetEndpointActionList as jest.Mock;

jest.mock('../../hooks/response_actions/use_get_endpoint_action_list', () => {
const original = jest.requireActual('../../hooks/response_actions/use_get_endpoint_action_list');
jest.mock('../../../hooks/response_actions/use_get_endpoint_action_list', () => {
const original = jest.requireActual(
'../../../hooks/response_actions/use_get_endpoint_action_list'
);
return {
...original,
useGetEndpointActionList: jest.fn(original.useGetEndpointActionList),
Expand Down Expand Up @@ -114,20 +116,20 @@ jest.mock('@kbn/kibana-react-plugin/public', () => {
};
});

jest.mock('../../hooks/endpoint/use_get_endpoints_list');
jest.mock('../../../hooks/endpoint/use_get_endpoints_list');

jest.mock('../../../common/experimental_features_service');
jest.mock('../../../../common/experimental_features_service');

jest.mock('../../../common/components/user_privileges');
jest.mock('../../../../common/components/user_privileges');
const useUserPrivilegesMock = _useUserPrivileges as jest.Mock;

let mockUseGetFileInfo: {
isFetching?: boolean;
error?: Partial<IHttpFetchError> | null;
data?: ActionFileInfoApiResponse;
};
jest.mock('../../hooks/response_actions/use_get_file_info', () => {
const original = jest.requireActual('../../hooks/response_actions/use_get_file_info');
jest.mock('../../../hooks/response_actions/use_get_file_info', () => {
const original = jest.requireActual('../../../hooks/response_actions/use_get_file_info');
return {
...original,
useGetFileInfo: () => mockUseGetFileInfo,
Expand All @@ -140,8 +142,8 @@ let mockUseGetActionDetails: {
error?: Partial<IHttpFetchError> | null;
data?: ActionDetailsApiResponse;
};
jest.mock('../../hooks/response_actions/use_get_action_details', () => {
const original = jest.requireActual('../../hooks/response_actions/use_get_action_details');
jest.mock('../../../hooks/response_actions/use_get_action_details', () => {
const original = jest.requireActual('../../../hooks/response_actions/use_get_action_details');
return {
...original,
useGetActionDetails: () => mockUseGetActionDetails,
Expand All @@ -156,8 +158,8 @@ const getBaseMockedActionList = () => ({
error: null,
refetch: jest.fn(),
});
// FLAKY: https://github.com/elastic/kibana/issues/145635
describe.skip('Response actions history', () => {

describe('Response actions history', () => {
const testPrefix = 'test';
const hostsFilterPrefix = 'hosts-filter';

Expand Down Expand Up @@ -642,14 +644,14 @@ describe.skip('Response actions history', () => {
expect(apiMocks.responseProvider.fileInfo).toHaveBeenCalled();
});

const downloadExecuteLink = getByTestId(`${testPrefix}-getExecuteLink`);
const downloadExecuteLink = getByTestId(`${testPrefix}-actionsLogTray-getExecuteLink`);
expect(downloadExecuteLink).toBeTruthy();
expect(downloadExecuteLink.textContent).toEqual(
'Click here to download full output(ZIP file passcode: elastic).Files are periodically deleted to clear storage space. Download and save file locally if needed.'
);
});

it('should contain execute output and error for `execute` action WITH execute operation privilege', async () => {
it('should contain expected output accordions for `execute` action WITH execute operation privilege', async () => {
const actionDetails = await getActionListMock({ actionCount: 1, commands: ['execute'] });
useGetEndpointActionListMock.mockReturnValue({
...getBaseMockedActionList(),
Expand Down Expand Up @@ -691,11 +693,17 @@ describe.skip('Response actions history', () => {
expect(apiMocks.responseProvider.fileInfo).toHaveBeenCalled();
});

const executeAccordions = getByTestId(`${testPrefix}-executeResponseOutput`);
expect(executeAccordions).toBeTruthy();
const accordionButtons = Array.from(executeAccordions.querySelectorAll('.euiAccordion'));
expect(accordionButtons[0]).toHaveTextContent('Execution output (truncated)');
expect(accordionButtons[1]).toHaveTextContent('Execution error (truncated)');
const accordionTitles = Array.from(
getByTestId(`${testPrefix}-executeDetails`).querySelectorAll(
'.euiAccordion__triggerWrapper'
)
).map((el) => el.textContent);

expect(accordionTitles).toEqual([
'Execution context',
'Execution error (truncated)',
'Execution output (truncated)',
]);
});

it('should contain execute output for `execute` action WITHOUT execute operation privilege', async () => {
Expand All @@ -715,7 +723,9 @@ describe.skip('Response actions history', () => {
const expandButton = getByTestId(`${testPrefix}-expand-button`);
userEvent.click(expandButton);

const executeAccordions = getByTestId(`${testPrefix}-executeResponseOutput`);
const executeAccordions = getByTestId(
`${testPrefix}-actionsLogTray-executeResponseOutput-output`
);
expect(executeAccordions).toBeTruthy();
});

Expand All @@ -737,7 +747,7 @@ describe.skip('Response actions history', () => {

const expandButton = getByTestId(`${testPrefix}-expand-button`);
userEvent.click(expandButton);
expect(queryByTestId(`${testPrefix}-getExecuteLink`)).toBeNull();
expect(queryByTestId(`${testPrefix}-actionsLogTray-getExecuteLink`)).toBeNull();

const output = getByTestId(`${testPrefix}-details-tray-output`);
expect(output).toBeTruthy();
Expand Down Expand Up @@ -775,7 +785,7 @@ describe.skip('Response actions history', () => {
const expandButton = getByTestId(`${testPrefix}-expand-button`);
userEvent.click(expandButton);

const output = getByTestId(`${testPrefix}-getExecuteLink`);
const output = getByTestId(`${testPrefix}-actionsLogTray-getExecuteLink`);
expect(output).toBeTruthy();
expect(output.textContent).toEqual(
'Click here to download full output(ZIP file passcode: elastic).Files are periodically deleted to clear storage space. Download and save file locally if needed.'
Expand Down

0 comments on commit 2d7fb43

Please sign in to comment.