Fixed due to comments

elastic · Mar 5, 2020 · 3f61937 · 3f61937
1 parent 2c1145e
commit 3f61937
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 177 deletions.
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/context/actions_connectors_context.tsx b/x-pack/plugins/triggers_actions_ui/public/application/context/actions_connectors_context.tsx
@@ -12,7 +12,7 @@ import { TypeRegistry } from '../type_registry';
 export interface ActionsConnectorsContextValue {
   http: HttpSetup;
   actionTypeRegistry: TypeRegistry<ActionTypeModel>;
-  toastNotifications?: Pick<
+  toastNotifications: Pick<
     ToastsApi,
     'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
   >;

diff --git a/...tions_ui/public/application/sections/action_connector_form/action_connector_form.test.tsx b/...tions_ui/public/application/sections/action_connector_form/action_connector_form.test.tsx
@@ -9,26 +9,21 @@ import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ValidationResult, ActionConnector } from '../../../types';
 import { ActionConnectorForm } from './action_connector_form';
+import { ActionsConnectorsContextValue } from '../../context/actions_connectors_context';
 const actionTypeRegistry = actionTypeRegistryMock.create();
 
 describe('action_connector_form', () => {
-  let deps: any;
+  let deps: ActionsConnectorsContextValue;
   beforeAll(async () => {
     const mocks = coreMock.createSetup();
     const [
       {
-        chrome,
-        docLinks,
         application: { capabilities },
       },
     ] = await mocks.getStartServices();
     deps = {
-      chrome,
-      docLinks,
       toastNotifications: mocks.notifications.toasts,
-      injectedMetadata: mocks.injectedMetadata,
       http: mocks.http,
-      uiSettings: mocks.uiSettings,
       capabilities: {
         ...capabilities,
         actions: {
@@ -37,11 +32,7 @@ describe('action_connector_form', () => {
           show: true,
         },
       },
-      legacy: {
-        MANAGEMENT_BREADCRUMB: { set: () => {} } as any,
-      },
       actionTypeRegistry: actionTypeRegistry as any,
-      alertTypeRegistry: {} as any,
     };
   });
 

diff --git a/...rs_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx b/...rs_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx
@@ -6,14 +6,17 @@
 import * as React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { ActionsConnectorsContextProvider } from '../../context/actions_connectors_context';
+import {
+  ActionsConnectorsContextProvider,
+  ActionsConnectorsContextValue,
+} from '../../context/actions_connectors_context';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ActionTypeMenu } from './action_type_menu';
 import { ValidationResult } from '../../../types';
 const actionTypeRegistry = actionTypeRegistryMock.create();
 
 describe('connector_add_flyout', () => {
-  let deps: any;
+  let deps: ActionsConnectorsContextValue;
 
   beforeAll(async () => {
     const mockes = coreMock.createSetup();
@@ -24,6 +27,7 @@ describe('connector_add_flyout', () => {
     ] = await mockes.getStartServices();
     deps = {
       http: mockes.http,
+      toastNotifications: mockes.notifications.toasts,
       capabilities: {
         ...capabilities,
         actions: {
@@ -60,6 +64,7 @@ describe('connector_add_flyout', () => {
           http: deps!.http,
           actionTypeRegistry: deps!.actionTypeRegistry,
           capabilities: deps!.capabilities,
+          toastNotifications: deps!.toastNotifications,
           reloadConnectors: () => {
             return new Promise<void>(() => {});
           },

diff --git a/...ctions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx b/...ctions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
@@ -7,15 +7,17 @@ import * as React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { ConnectorAddFlyout } from './connector_add_flyout';
-import { ActionsConnectorsContextProvider } from '../../context/actions_connectors_context';
+import {
+  ActionsConnectorsContextProvider,
+  ActionsConnectorsContextValue,
+} from '../../context/actions_connectors_context';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ValidationResult } from '../../../types';
-import { AppContextProvider } from '../../app_context';
 
 const actionTypeRegistry = actionTypeRegistryMock.create();
 
 describe('connector_add_flyout', () => {
-  let deps: any;
+  let deps: ActionsConnectorsContextValue;
 
   beforeAll(async () => {
     const mocks = coreMock.createSetup();
@@ -36,7 +38,6 @@ describe('connector_add_flyout', () => {
         },
       },
       actionTypeRegistry: actionTypeRegistry as any,
-      alertTypeRegistry: {} as any,
     };
   });
 
@@ -59,30 +60,29 @@ describe('connector_add_flyout', () => {
     actionTypeRegistry.has.mockReturnValue(true);
 
     const wrapper = mountWithIntl(
-      <AppContextProvider appDeps={deps}>
-        <ActionsConnectorsContextProvider
-          value={{
-            http: deps!.http,
-            actionTypeRegistry: deps!.actionTypeRegistry,
-            capabilities: deps!.capabilities,
-            reloadConnectors: () => {
-              return new Promise<void>(() => {});
+      <ActionsConnectorsContextProvider
+        value={{
+          http: deps!.http,
+          toastNotifications: deps!.toastNotifications,
+          actionTypeRegistry: deps!.actionTypeRegistry,
+          capabilities: deps!.capabilities,
+          reloadConnectors: () => {
+            return new Promise<void>(() => {});
+          },
+        }}
+      >
+        <ConnectorAddFlyout
+          addFlyoutVisible={true}
+          setAddFlyoutVisibility={() => {}}
+          actionTypes={[
+            {
+              id: actionType.id,
+              enabled: true,
+              name: 'Test',
             },
-          }}
-        >
-          <ConnectorAddFlyout
-            addFlyoutVisible={true}
-            setAddFlyoutVisibility={state => {}}
-            actionTypes={[
-              {
-                id: actionType.id,
-                enabled: true,
-                name: 'Test',
-              },
-            ]}
-          />
-        </ActionsConnectorsContextProvider>
-      </AppContextProvider>
+          ]}
+        />
+      </ActionsConnectorsContextProvider>
     );
     expect(wrapper.find('ActionTypeMenu')).toHaveLength(1);
     expect(wrapper.find('[data-test-subj="my-action-type-card"]').exists()).toBeTruthy();

diff --git a/...actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx b/...actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx
@@ -9,32 +9,22 @@ import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { ConnectorAddModal } from './connector_add_modal';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ValidationResult } from '../../../types';
-import { AppDeps } from '../../app';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { chartPluginMock } from '../../../../../../../src/plugins/charts/public/mocks';
+import { ActionsConnectorsContextValue } from '../../context/actions_connectors_context';
 const actionTypeRegistry = actionTypeRegistryMock.create();
 
 describe('connector_add_modal', () => {
-  let deps: AppDeps | null;
+  let deps: ActionsConnectorsContextValue;
 
   beforeAll(async () => {
     const mocks = coreMock.createSetup();
     const [
       {
-        chrome,
-        docLinks,
         application: { capabilities },
       },
     ] = await mocks.getStartServices();
     deps = {
-      chrome,
-      docLinks,
-      dataPlugin: dataPluginMock.createStartContract(),
-      charts: chartPluginMock.createStartContract(),
       toastNotifications: mocks.notifications.toasts,
-      injectedMetadata: mocks.injectedMetadata,
       http: mocks.http,
-      uiSettings: mocks.uiSettings,
       capabilities: {
         ...capabilities,
         actions: {
@@ -43,9 +33,7 @@ describe('connector_add_modal', () => {
           show: true,
         },
       },
-      setBreadcrumbs: jest.fn(),
       actionTypeRegistry: actionTypeRegistry as any,
-      alertTypeRegistry: {} as any,
     };
   });
   it('renders connector modal form if addModalVisible is true', () => {
@@ -80,7 +68,7 @@ describe('connector_add_modal', () => {
             actionType={actionType}
             http={deps.http}
             actionTypeRegistry={deps.actionTypeRegistry}
-            alertTypeRegistry={deps.alertTypeRegistry}
+            alertTypeRegistry={{} as any}
             toastNotifications={deps.toastNotifications}
           />
         )

diff --git a/...tions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx b/...tions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx
@@ -11,8 +11,6 @@ import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ValidationResult } from '../../../types';
 import { ConnectorEditFlyout } from './connector_edit_flyout';
 import { AppContextProvider } from '../../app_context';
-import { chartPluginMock } from '../../../../../../../src/plugins/charts/public/mocks';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
 
 const actionTypeRegistry = actionTypeRegistryMock.create();
 let deps: any;
@@ -22,18 +20,11 @@ describe('connector_edit_flyout', () => {
     const mockes = coreMock.createSetup();
     const [
       {
-        chrome,
-        docLinks,
         application: { capabilities },
       },
     ] = await mockes.getStartServices();
     deps = {
-      chrome,
-      docLinks,
-      dataPlugin: dataPluginMock.createStartContract(),
-      charts: chartPluginMock.createStartContract(),
       toastNotifications: mockes.notifications.toasts,
-      injectedMetadata: mockes.injectedMetadata,
       http: mockes.http,
       uiSettings: mockes.uiSettings,
       capabilities: {
@@ -44,7 +35,6 @@ describe('connector_edit_flyout', () => {
           show: true,
         },
       },
-      setBreadcrumbs: jest.fn(),
       actionTypeRegistry: actionTypeRegistry as any,
       alertTypeRegistry: {} as any,
     };
@@ -83,6 +73,7 @@ describe('connector_edit_flyout', () => {
         <ActionsConnectorsContextProvider
           value={{
             http: deps.http,
+            toastNotifications: deps.toastNotifications,
             capabilities: deps.capabilities,
             actionTypeRegistry: deps.actionTypeRegistry,
             reloadConnectors: () => {

diff --git a/...ck/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx b/...ck/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx
@@ -20,7 +20,7 @@ describe('alert_edit', () => {
   let deps: any;
   let wrapper: ReactWrapper<any>;
 
-  beforeAll(async () => {
+  async function setup() {
     const mockes = coreMock.createSetup();
     deps = {
       toastNotifications: mockes.notifications.toasts,
@@ -122,9 +122,10 @@ describe('alert_edit', () => {
       await nextTick();
       wrapper.update();
     });
-  });
+  }
 
-  it('renders alert add flyout', () => {
+  it('renders alert add flyout', async () => {
+    await setup();
     expect(wrapper.find('[data-test-subj="editAlertFlyoutTitle"]').exists()).toBeTruthy();
     expect(wrapper.find('[data-test-subj="saveEditedAlertButton"]').exists()).toBeTruthy();
   });