PR feedback

elastic · Jan 7, 2021 · d725669 · d725669
1 parent 4773519
commit d725669
Show file tree

Hide file tree

Showing 12 changed files with 156 additions and 361 deletions.
diff --git a/x-pack/plugins/case/server/client/alerts/update_status.test.ts b/x-pack/plugins/case/server/client/alerts/update_status.test.ts
@@ -9,10 +9,6 @@ import { createMockSavedObjectsRepository } from '../../routes/api/__fixtures__'
 import { createCaseClientWithMockSavedObjectsClient } from '../mocks';
 
 describe('updateAlertsStatus', () => {
-  beforeEach(async () => {
-    jest.restoreAllMocks();
-  });
-
   describe('happy path', () => {
     test('it update the status of the alert correctly', async () => {
       const savedObjectsClient = createMockSavedObjectsRepository();

diff --git a/x-pack/plugins/case/server/routes/api/cases/status/get_status.test.ts b/x-pack/plugins/case/server/routes/api/cases/status/get_status.test.ts
@@ -17,6 +17,13 @@ import { CASE_STATUS_URL } from '../../../../../common/constants';
 
 describe('GET status', () => {
   let routeHandler: RequestHandler<any, any, any>;
+  const findArgs = {
+    fields: [],
+    page: 1,
+    perPage: 1,
+    type: 'cases',
+  };
+
   beforeAll(async () => {
     routeHandler = await createRoute(initGetCasesStatusApi, 'get');
   });
@@ -35,27 +42,18 @@ describe('GET status', () => {
 
     const response = await routeHandler(theContext, request, kibanaResponseFactory);
     expect(theContext.core.savedObjects.client.find).toHaveBeenNthCalledWith(1, {
-      fields: [],
+      ...findArgs,
       filter: 'cases.attributes.status: open',
-      page: 1,
-      perPage: 1,
-      type: 'cases',
     });
 
     expect(theContext.core.savedObjects.client.find).toHaveBeenNthCalledWith(2, {
-      fields: [],
+      ...findArgs,
       filter: 'cases.attributes.status: in-progress',
-      page: 1,
-      perPage: 1,
-      type: 'cases',
     });
 
     expect(theContext.core.savedObjects.client.find).toHaveBeenNthCalledWith(3, {
-      fields: [],
+      ...findArgs,
       filter: 'cases.attributes.status: closed',
-      page: 1,
-      perPage: 1,
-      type: 'cases',
     });
 
     expect(response.payload).toEqual({

diff --git a/x-pack/plugins/case/server/services/alerts/index.test.ts b/x-pack/plugins/case/server/services/alerts/index.test.ts
@@ -14,6 +14,12 @@ describe('updateAlertsStatus', () => {
 
   describe('happy path', () => {
     let alertService: AlertServiceContract;
+    const args = {
+      ids: ['alert-id-1'],
+      index: '.siem-signals',
+      request: {} as KibanaRequest,
+      status: CaseStatuses.closed,
+    };
 
     beforeEach(async () => {
       alertService = new AlertService();
@@ -22,21 +28,16 @@ describe('updateAlertsStatus', () => {
 
     test('it update the status of the alert correctly', async () => {
       alertService.initialize(esClientMock);
-      await alertService.updateAlertsStatus({
-        ids: ['alert-id-1'],
-        index: '.siem-signals',
-        request: {} as KibanaRequest,
-        status: CaseStatuses.closed,
-      });
+      await alertService.updateAlertsStatus(args);
 
       expect(esClientMock.asScoped().asCurrentUser.updateByQuery).toHaveBeenCalledWith({
         body: {
-          query: { ids: { values: ['alert-id-1'] } },
-          script: { lang: 'painless', source: "ctx._source.signal.status = 'closed'" },
+          query: { ids: { values: args.ids } },
+          script: { lang: 'painless', source: `ctx._source.signal.status = '${args.status}'` },
         },
         conflicts: 'abort',
         ignore_unavailable: true,
-        index: '.siem-signals',
+        index: args.index,
       });
     });
 
@@ -49,14 +50,7 @@ describe('updateAlertsStatus', () => {
       });
 
       test('it throws when service is not initialized and try to update the status', async () => {
-        await expect(
-          alertService.updateAlertsStatus({
-            ids: ['alert-id-1'],
-            index: '.siem-signals',
-            request: {} as KibanaRequest,
-            status: CaseStatuses.closed,
-          })
-        ).rejects.toThrow();
+        await expect(alertService.updateAlertsStatus(args)).rejects.toThrow();
       });
     });
   });

diff --git a/x-pack/plugins/security_solution/public/cases/components/all_cases/status_filter.test.tsx b/x-pack/plugins/security_solution/public/cases/components/all_cases/status_filter.test.tsx
@@ -19,27 +19,20 @@ const stats = {
 
 describe('StatusFilter', () => {
   const onStatusChanged = jest.fn();
+  const defaultProps = {
+    selectedStatus: CaseStatuses.open,
+    onStatusChanged,
+    stats,
+  };
 
   it('should render', () => {
-    const wrapper = mount(
-      <StatusFilter
-        onStatusChanged={onStatusChanged}
-        selectedStatus={CaseStatuses.open}
-        stats={stats}
-      />
-    );
+    const wrapper = mount(<StatusFilter {...defaultProps} />);
 
     expect(wrapper.find('[data-test-subj="case-status-filter"]').exists()).toBeTruthy();
   });
 
   it('should call onStatusChanged when changing status to open', async () => {
-    const wrapper = mount(
-      <StatusFilter
-        onStatusChanged={onStatusChanged}
-        selectedStatus={CaseStatuses.open}
-        stats={stats}
-      />
-    );
+    const wrapper = mount(<StatusFilter {...defaultProps} />);
 
     await waitFor(() => {
       wrapper.find('button[data-test-subj="case-status-filter"]').simulate('click');
@@ -49,13 +42,7 @@ describe('StatusFilter', () => {
   });
 
   it('should call onStatusChanged when changing status to in-progress', async () => {
-    const wrapper = mount(
-      <StatusFilter
-        onStatusChanged={onStatusChanged}
-        selectedStatus={CaseStatuses.open}
-        stats={stats}
-      />
-    );
+    const wrapper = mount(<StatusFilter {...defaultProps} />);
 
     await waitFor(() => {
       wrapper.find('button[data-test-subj="case-status-filter"]').simulate('click');
@@ -65,13 +52,7 @@ describe('StatusFilter', () => {
   });
 
   it('should call onStatusChanged when changing status to closed', async () => {
-    const wrapper = mount(
-      <StatusFilter
-        onStatusChanged={onStatusChanged}
-        selectedStatus={CaseStatuses.open}
-        stats={stats}
-      />
-    );
+    const wrapper = mount(<StatusFilter {...defaultProps} />);
 
     await waitFor(() => {
       wrapper.find('button[data-test-subj="case-status-filter"]').simulate('click');

diff --git a/x-pack/plugins/security_solution/public/cases/components/case_action_bar/index.test.tsx b/x-pack/plugins/security_solution/public/cases/components/case_action_bar/index.test.tsx
@@ -14,6 +14,13 @@ import { TestProviders } from '../../../common/mock';
 describe('CaseActionBar', () => {
   const onRefresh = jest.fn();
   const onUpdateField = jest.fn();
+  const defaultProps = {
+    caseData: basicCase,
+    isLoading: false,
+    onRefresh,
+    onUpdateField,
+    currentExternalIncident: null,
+  };
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -22,13 +29,7 @@ describe('CaseActionBar', () => {
   it('it renders', () => {
     const wrapper = mount(
       <TestProviders>
-        <CaseActionBar
-          caseData={basicCase}
-          isLoading={false}
-          onRefresh={onRefresh}
-          onUpdateField={onUpdateField}
-          currentExternalIncident={null}
-        />
+        <CaseActionBar {...defaultProps} />
       </TestProviders>
     );
 
@@ -43,13 +44,7 @@ describe('CaseActionBar', () => {
   it('it should show correct status', () => {
     const wrapper = mount(
       <TestProviders>
-        <CaseActionBar
-          caseData={basicCase}
-          isLoading={false}
-          onRefresh={onRefresh}
-          onUpdateField={onUpdateField}
-          currentExternalIncident={null}
-        />
+        <CaseActionBar {...defaultProps} />
       </TestProviders>
     );
 
@@ -61,13 +56,7 @@ describe('CaseActionBar', () => {
   it('it should show the correct date', () => {
     const wrapper = mount(
       <TestProviders>
-        <CaseActionBar
-          caseData={basicCase}
-          isLoading={false}
-          onRefresh={onRefresh}
-          onUpdateField={onUpdateField}
-          currentExternalIncident={null}
-        />
+        <CaseActionBar {...defaultProps} />
       </TestProviders>
     );
 
@@ -79,13 +68,7 @@ describe('CaseActionBar', () => {
   it('it call onRefresh', () => {
     const wrapper = mount(
       <TestProviders>
-        <CaseActionBar
-          caseData={basicCase}
-          isLoading={false}
-          onRefresh={onRefresh}
-          onUpdateField={onUpdateField}
-          currentExternalIncident={null}
-        />
+        <CaseActionBar {...defaultProps} />
       </TestProviders>
     );
 
@@ -96,13 +79,7 @@ describe('CaseActionBar', () => {
   it('it should call onUpdateField when changing status', () => {
     const wrapper = mount(
       <TestProviders>
-        <CaseActionBar
-          caseData={basicCase}
-          isLoading={false}
-          onRefresh={onRefresh}
-          onUpdateField={onUpdateField}
-          currentExternalIncident={null}
-        />
+        <CaseActionBar {...defaultProps} />
       </TestProviders>
     );
 
@@ -117,13 +94,7 @@ describe('CaseActionBar', () => {
   it('it should call onUpdateField when changing syncAlerts setting', () => {
     const wrapper = mount(
       <TestProviders>
-        <CaseActionBar
-          caseData={basicCase}
-          isLoading={false}
-          onRefresh={onRefresh}
-          onUpdateField={onUpdateField}
-          currentExternalIncident={null}
-        />
+        <CaseActionBar {...defaultProps} />
       </TestProviders>
     );
 

diff --git a/...ugins/security_solution/public/cases/components/case_settings/sync_alerts_switch.test.tsx b/...ugins/security_solution/public/cases/components/case_settings/sync_alerts_switch.test.tsx
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-import { act } from '@testing-library/react';
+import { waitFor } from '@testing-library/react';
 
 import { SyncAlertsSwitch } from './sync_alerts_switch';
 
@@ -20,14 +20,13 @@ describe('SyncAlertsSwitch', () => {
   it('it toggles the switch', async () => {
     const wrapper = mount(<SyncAlertsSwitch disabled={false} />);
 
-    act(() => {
-      wrapper.find('button[data-test-subj="sync-alerts-switch"]').first().simulate('click');
-    });
+    wrapper.find('button[data-test-subj="sync-alerts-switch"]').first().simulate('click');
 
-    wrapper.update();
-    expect(wrapper.find('[data-test-subj="sync-alerts-switch"]').first().prop('checked')).toBe(
-      false
-    );
+    await waitFor(() => {
+      expect(wrapper.find('[data-test-subj="sync-alerts-switch"]').first().prop('checked')).toBe(
+        false
+      );
+    });
   });
 
   it('it disables the switch', async () => {
@@ -48,13 +47,10 @@ describe('SyncAlertsSwitch', () => {
     const wrapper = mount(<SyncAlertsSwitch disabled={false} showLabel={true} />);
 
     expect(wrapper.find('[data-test-subj="sync-alerts-switch"]').first().text()).toBe('On');
+    wrapper.find('button[data-test-subj="sync-alerts-switch"]').first().simulate('click');
 
-    act(() => {
-      wrapper.find('button[data-test-subj="sync-alerts-switch"]').first().simulate('click');
+    await waitFor(() => {
+      expect(wrapper.find(`[data-test-subj="sync-alerts-switch"]`).first().text()).toBe('Off');
     });
-
-    wrapper.update();
-
-    expect(wrapper.find(`[data-test-subj="sync-alerts-switch"]`).first().text()).toBe('Off');
   });
 });
diff --git a/x-pack/plugins/security_solution/public/cases/components/case_view/index.test.tsx b/x-pack/plugins/security_solution/public/cases/components/case_view/index.test.tsx
@@ -147,7 +147,7 @@ describe('CaseView ', () => {
     useConnectorsMock.mockImplementation(() => ({ connectors: connectorsMock, isLoading: false }));
     useQueryAlertsMock.mockImplementation(() => ({
       loading: false,
-      data: { hits: { hits: [...alertsHit] } },
+      data: { hits: { hits: alertsHit } },
     }));
   });