Merge branch 'master' of github.com:elastic/kibana into ingest_pipeli…

…nes/component_tests
elastic · May 7, 2020 · 552c052 · 552c052
2 parents b696a6d + 4a44042
commit 552c052
Show file tree

Hide file tree

Showing 28 changed files with 85 additions and 182 deletions.
diff --git a/test/functional/apps/timelion/index.js b/test/functional/apps/timelion/index.js
@@ -28,7 +28,7 @@ export default function({ getService, loadTestFile }) {
 
     before(async function() {
       log.debug('Starting timelion before method');
-      browser.setWindowSize(1280, 800);
+      await browser.setWindowSize(1280, 800);
       await esArchiver.loadIfNeeded('logstash_functional');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
     });

diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
@@ -33,7 +33,7 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
 
   class SettingsPage {
     async clickNavigation() {
-      find.clickDisplayedByCssSelector('.app-link:nth-child(5) a');
+      await find.clickDisplayedByCssSelector('.app-link:nth-child(5) a');
     }
 
     async clickLinkText(text: string) {
@@ -110,7 +110,7 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
     }
 
     async toggleAdvancedSettingCheckbox(propertyName: string) {
-      testSubjects.click(`advancedSetting-editField-${propertyName}`);
+      await testSubjects.click(`advancedSetting-editField-${propertyName}`);
       await PageObjects.header.waitUntilLoadingHasFinished();
       await testSubjects.click(`advancedSetting-saveButton`);
       await PageObjects.header.waitUntilLoadingHasFinished();

diff --git a/test/functional/services/find.ts b/test/functional/services/find.ts
@@ -476,7 +476,7 @@ export async function FindProvider({ getService }: FtrProviderContext) {
       value: string
     ): Promise<void> {
       log.debug(`Find.waitForAttributeToChange('${selector}', '${attribute}', '${value}')`);
-      retry.waitFor(`${attribute} to equal "${value}"`, async () => {
+      await retry.waitFor(`${attribute} to equal "${value}"`, async () => {
         const el = await this.byCssSelector(selector);
         return value === (await el.getAttribute(attribute));
       });

diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@@ -40,8 +40,8 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
   const find = getService('find');
   const testSubjects = getService('testSubjects');
 
-  const navigateTo = (path: string) =>
-    browser.navigateTo(`${PageObjects.common.getHostPort()}${path}`);
+  const navigateTo = async (path: string) =>
+    await browser.navigateTo(`${PageObjects.common.getHostPort()}${path}`);
   const navigateToApp = async (title: string) => {
     await appsMenu.clickLink(title);
     return browser.execute(() => {

diff --git a/.../triggers_actions_ui/public/application/components/builtin_action_types/es_index.test.tsx b/.../triggers_actions_ui/public/application/components/builtin_action_types/es_index.test.tsx
@@ -11,7 +11,6 @@ import { registerBuiltInActionTypes } from './index';
 import { ActionTypeModel, ActionParamsProps } from '../../../types';
 import { IndexActionParams, EsIndexActionConnector } from './types';
 import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { ActionsConnectorsContextProvider } from '../../context/actions_connectors_context';
 jest.mock('../../../common/index_controls', () => ({
   firstFieldOption: jest.fn(),
   getFields: jest.fn(),
@@ -165,25 +164,13 @@ describe('IndexActionConnectorFields renders', () => {
       },
     } as EsIndexActionConnector;
     const wrapper = mountWithIntl(
-      <ActionsConnectorsContextProvider
-        value={{
-          http: deps!.http,
-          actionTypeRegistry: deps!.actionTypeRegistry,
-          capabilities: deps!.capabilities,
-          toastNotifications: deps!.toastNotifications,
-          reloadConnectors: () => {
-            return new Promise<void>(() => {});
-          },
-          docLinks: deps!.docLinks,
-        }}
-      >
-        <ConnectorFields
-          action={actionConnector}
-          errors={{ index: [] }}
-          editActionConfig={() => {}}
-          editActionSecrets={() => {}}
-        />
-      </ActionsConnectorsContextProvider>
+      <ConnectorFields
+        action={actionConnector}
+        errors={{ index: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        http={deps!.http}
+      />
     );
 
     await act(async () => {

diff --git a/...ugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx b/...ugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx
@@ -33,7 +33,6 @@ import {
   getIndexPatterns,
 } from '../../../common/index_controls';
 import { AddMessageVariables } from '../add_message_variables';
-import { useActionsConnectorsContext } from '../../context/actions_connectors_context';
 
 export function getActionType(): ActionTypeModel {
   return {
@@ -79,8 +78,7 @@ export function getActionType(): ActionTypeModel {
 
 const IndexActionConnectorFields: React.FunctionComponent<ActionConnectorFieldsProps<
   EsIndexActionConnector
->> = ({ action, editActionConfig, errors }) => {
-  const { http } = useActionsConnectorsContext();
+>> = ({ action, editActionConfig, errors, http }) => {
   const { index, refresh, executionTimeField } = action.config;
   const [hasTimeFieldCheckbox, setTimeFieldCheckboxState] = useState<boolean>(
     executionTimeField != null

diff --git a/...triggers_actions_ui/public/application/components/builtin_action_types/pagerduty.test.tsx b/...triggers_actions_ui/public/application/components/builtin_action_types/pagerduty.test.tsx
@@ -6,7 +6,6 @@
 import React, { FunctionComponent } from 'react';
 import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { TypeRegistry } from '../../type_registry';
 import { registerBuiltInActionTypes } from './index';
 import { ActionTypeModel, ActionParamsProps } from '../../../types';
@@ -16,7 +15,6 @@ import {
   SeverityActionOptions,
   PagerDutyActionConnector,
 } from './types';
-import { ActionsConnectorsContextProvider } from '../../context/actions_connectors_context';
 
 const ACTION_TYPE_ID = '.pagerduty';
 let actionTypeModel: ActionTypeModel;
@@ -29,24 +27,7 @@ beforeAll(async () => {
   if (getResult !== null) {
     actionTypeModel = getResult;
   }
-  const mocks = coreMock.createSetup();
-  const [
-    {
-      application: { capabilities },
-    },
-  ] = await mocks.getStartServices();
   deps = {
-    toastNotifications: mocks.notifications.toasts,
-    http: mocks.http,
-    capabilities: {
-      ...capabilities,
-      actions: {
-        delete: true,
-        save: true,
-        show: true,
-      },
-    },
-    actionTypeRegistry: actionTypeRegistry as any,
     docLinks: { ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' },
   };
 });
@@ -148,25 +129,13 @@ describe('PagerDutyActionConnectorFields renders', () => {
       },
     } as PagerDutyActionConnector;
     const wrapper = mountWithIntl(
-      <ActionsConnectorsContextProvider
-        value={{
-          http: deps!.http,
-          actionTypeRegistry: deps!.actionTypeRegistry,
-          capabilities: deps!.capabilities,
-          toastNotifications: deps!.toastNotifications,
-          reloadConnectors: () => {
-            return new Promise<void>(() => {});
-          },
-          docLinks: deps!.docLinks,
-        }}
-      >
-        <ConnectorFields
-          action={actionConnector}
-          errors={{ index: [], routingKey: [] }}
-          editActionConfig={() => {}}
-          editActionSecrets={() => {}}
-        />
-      </ActionsConnectorsContextProvider>
+      <ConnectorFields
+        action={actionConnector}
+        errors={{ index: [], routingKey: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        docLinks={deps!.docLinks}
+      />
     );
 
     await act(async () => {

diff --git a/...gins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty.tsx b/...gins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty.tsx
@@ -25,7 +25,6 @@ import { PagerDutyActionParams, PagerDutyActionConnector } from './types';
 import pagerDutySvg from './pagerduty.svg';
 import { AddMessageVariables } from '../add_message_variables';
 import { hasMustacheTokens } from '../../lib/has_mustache_tokens';
-import { useActionsConnectorsContext } from '../../context/actions_connectors_context';
 
 export function getActionType(): ActionTypeModel {
   return {
@@ -105,8 +104,7 @@ export function getActionType(): ActionTypeModel {
 
 const PagerDutyActionConnectorFields: React.FunctionComponent<ActionConnectorFieldsProps<
   PagerDutyActionConnector
->> = ({ errors, action, editActionConfig, editActionSecrets }) => {
-  const { docLinks } = useActionsConnectorsContext();
+>> = ({ errors, action, editActionConfig, editActionSecrets, docLinks }) => {
   const { apiUrl } = action.config;
   const { routingKey } = action.secrets;
   return (

diff --git a/...ins/triggers_actions_ui/public/application/components/builtin_action_types/slack.test.tsx b/...ins/triggers_actions_ui/public/application/components/builtin_action_types/slack.test.tsx
@@ -6,12 +6,10 @@
 import React, { FunctionComponent } from 'react';
 import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { TypeRegistry } from '../../type_registry';
 import { registerBuiltInActionTypes } from './index';
 import { ActionTypeModel, ActionParamsProps } from '../../../types';
 import { SlackActionParams, SlackActionConnector } from './types';
-import { ActionsConnectorsContextProvider } from '../../context/actions_connectors_context';
 
 const ACTION_TYPE_ID = '.slack';
 let actionTypeModel: ActionTypeModel;
@@ -25,24 +23,7 @@ beforeAll(async () => {
   if (getResult !== null) {
     actionTypeModel = getResult;
   }
-  const mocks = coreMock.createSetup();
-  const [
-    {
-      application: { capabilities },
-    },
-  ] = await mocks.getStartServices();
   deps = {
-    toastNotifications: mocks.notifications.toasts,
-    http: mocks.http,
-    capabilities: {
-      ...capabilities,
-      actions: {
-        delete: true,
-        save: true,
-        show: true,
-      },
-    },
-    actionTypeRegistry: actionTypeRegistry as any,
     docLinks: { ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' },
   };
 });
@@ -119,25 +100,13 @@ describe('SlackActionFields renders', () => {
       config: {},
     } as SlackActionConnector;
     const wrapper = mountWithIntl(
-      <ActionsConnectorsContextProvider
-        value={{
-          http: deps!.http,
-          actionTypeRegistry: deps!.actionTypeRegistry,
-          capabilities: deps!.capabilities,
-          toastNotifications: deps!.toastNotifications,
-          reloadConnectors: () => {
-            return new Promise<void>(() => {});
-          },
-          docLinks: deps!.docLinks,
-        }}
-      >
-        <ConnectorFields
-          action={actionConnector}
-          errors={{ index: [], webhookUrl: [] }}
-          editActionConfig={() => {}}
-          editActionSecrets={() => {}}
-        />
-      </ActionsConnectorsContextProvider>
+      <ConnectorFields
+        action={actionConnector}
+        errors={{ index: [], webhookUrl: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        docLinks={deps!.docLinks}
+      />
     );
 
     await act(async () => {

diff --git a/.../plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack.tsx b/.../plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack.tsx
@@ -15,7 +15,6 @@ import {
 } from '../../../types';
 import { SlackActionParams, SlackActionConnector } from './types';
 import { AddMessageVariables } from '../add_message_variables';
-import { useActionsConnectorsContext } from '../../context/actions_connectors_context';
 
 export function getActionType(): ActionTypeModel {
   return {
@@ -76,8 +75,7 @@ export function getActionType(): ActionTypeModel {
 
 const SlackActionFields: React.FunctionComponent<ActionConnectorFieldsProps<
   SlackActionConnector
->> = ({ action, editActionSecrets, errors }) => {
-  const { docLinks } = useActionsConnectorsContext();
+>> = ({ action, editActionSecrets, errors, docLinks }) => {
   const { webhookUrl } = action.secrets;
 
   return (

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/context/alerts_context.tsx b/x-pack/plugins/triggers_actions_ui/public/application/context/alerts_context.tsx
@@ -49,7 +49,7 @@ export const AlertsContextProvider = ({
 export const useAlertsContext = () => {
   const ctx = useContext(AlertsContext);
   if (!ctx) {
-    throw new Error('ActionsConnectorsContext has not been set.');
+    throw new Error('AlertsContext has not been set.');
   }
   return ctx;
 };
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,29 +9,14 @@ 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 { ActionsConnectorsContextProvider } from '../../context/actions_connectors_context';
 const actionTypeRegistry = actionTypeRegistryMock.create();
 
 describe('action_connector_form', () => {
   let deps: any;
   beforeAll(async () => {
     const mocks = coreMock.createSetup();
-    const [
-      {
-        application: { capabilities },
-      },
-    ] = await mocks.getStartServices();
     deps = {
-      toastNotifications: mocks.notifications.toasts,
       http: mocks.http,
-      capabilities: {
-        ...capabilities,
-        actions: {
-          delete: true,
-          save: true,
-          show: true,
-        },
-      },
       actionTypeRegistry: actionTypeRegistry as any,
       docLinks: { ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' },
     };
@@ -63,25 +48,15 @@ describe('action_connector_form', () => {
     let wrapper;
     if (deps) {
       wrapper = mountWithIntl(
-        <ActionsConnectorsContextProvider
-          value={{
-            http: deps!.http,
-            actionTypeRegistry: deps!.actionTypeRegistry,
-            capabilities: deps!.capabilities,
-            toastNotifications: deps!.toastNotifications,
-            reloadConnectors: () => {
-              return new Promise<void>(() => {});
-            },
-            docLinks: deps!.docLinks,
-          }}
-        >
-          <ActionConnectorForm
-            actionTypeName={'my-action-type-name'}
-            connector={initialConnector}
-            dispatch={() => {}}
-            errors={{ name: [] }}
-          />
-        </ActionsConnectorsContextProvider>
+        <ActionConnectorForm
+          actionTypeName={'my-action-type-name'}
+          connector={initialConnector}
+          dispatch={() => {}}
+          errors={{ name: [] }}
+          http={deps!.http}
+          actionTypeRegistry={deps!.actionTypeRegistry}
+          docLinks={deps!.docLinks}
+        />
       );
     }
     const connectorNameField = wrapper?.find('[data-test-subj="nameInput"]');