Merge branch 'main' into cell-actions-phase-2

elastic · Jun 27, 2023 · 0316383 · 0316383
2 parents a07b6df + b33d008
commit 0316383
Show file tree

Hide file tree

Showing 45 changed files with 587 additions and 553 deletions.
diff --git a/test/functional/apps/home/_add_data.ts b/test/functional/apps/home/_add_data.ts
@@ -11,7 +11,8 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'header', 'home', 'dashboard']);
 
-  describe('add data tutorials', function describeIndexTests() {
+  // Failing: See https://github.com/elastic/kibana/issues/154699
+  describe.skip('add data tutorials', function describeIndexTests() {
     it('directory should redirect to integrations app', async () => {
       await PageObjects.common.navigateToUrl('home', 'tutorial_directory', { useActualUrl: true });
       await PageObjects.common.waitUntilUrlIncludes('/app/integrations');

diff --git a/...ic/common/lib/kibana/kibana_react.mock.ts → ...c/common/lib/kibana/kibana_react.mock.tsx b/...ic/common/lib/kibana/kibana_react.mock.ts → ...c/common/lib/kibana/kibana_react.mock.tsx
@@ -30,6 +30,7 @@ interface StartServiceArgs {
 
 export const createStartServicesMock = ({ license }: StartServiceArgs = {}): StartServices => {
   const licensingPluginMock = licensingMock.createStart();
+  const triggersActionsUi = triggersActionsUiMock.createStart();
 
   const services = {
     ...coreMock.createStart(),
@@ -39,7 +40,11 @@ export const createStartServicesMock = ({ license }: StartServiceArgs = {}): Sta
       navigateToPrefilledEditor: jest.fn(),
     },
     security: securityMock.createStart(),
-    triggersActionsUi: triggersActionsUiMock.createStart(),
+    triggersActionsUi: {
+      actionTypeRegistry: triggersActionsUi.actionTypeRegistry,
+      alertsTableConfigurationRegistry: triggersActionsUi.alertsTableConfigurationRegistry,
+      getAlertsStateTable: jest.fn().mockReturnValue(<div data-test-subj="alerts-table" />),
+    },
     spaces: spacesPluginMock.createStartContract(),
     licensing:
       license != null