make install status available to be read by test util

elastic · Mar 12, 2024 · 31519cb · 31519cb
1 parent 142df27
commit 31519cb
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/packages/home/sample_data_card/src/footer/index.tsx b/packages/home/sample_data_card/src/footer/index.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
+import React, { useCallback } from 'react';
 import { SampleDataSet, InstalledStatus } from '@kbn/home-sample-data-types';
 import { INSTALLED_STATUS, UNINSTALLED_STATUS } from '../constants';
 
@@ -28,13 +28,27 @@ export interface Props {
  * Displays the appropriate Footer component based on the status of the Sample Data Set.
  */
 export const Footer = ({ sampleDataSet, onAction }: Props) => {
-  if (sampleDataSet.status === INSTALLED_STATUS) {
-    return <RemoveFooter onRemove={(id) => onAction(id, UNINSTALLED_STATUS)} {...sampleDataSet} />;
-  }
+  const renderContent = useCallback(() => {
+    if (sampleDataSet.status === INSTALLED_STATUS) {
+      return (
+        <RemoveFooter onRemove={(id) => onAction(id, UNINSTALLED_STATUS)} {...sampleDataSet} />
+      );
+    }
 
-  if (sampleDataSet.status === UNINSTALLED_STATUS) {
-    return <InstallFooter onInstall={(id) => onAction(id, INSTALLED_STATUS)} {...sampleDataSet} />;
-  }
+    if (sampleDataSet.status === UNINSTALLED_STATUS) {
+      return (
+        <InstallFooter onInstall={(id) => onAction(id, INSTALLED_STATUS)} {...sampleDataSet} />
+      );
+    }
 
-  return <DisabledFooter {...sampleDataSet} />;
+    return <DisabledFooter {...sampleDataSet} />;
+  }, [onAction, sampleDataSet]);
+
+  return (
+    // the data-status attribute is added to solve issues with failing test,
+    // see https://github.com/elastic/kibana/issues/112103
+    <div data-status={sampleDataSet.status} style={{ display: 'contents' }}>
+      {renderContent()}
+    </div>
+  );
 };
diff --git a/test/functional/page_objects/home_page.ts b/test/functional/page_objects/home_page.ts
@@ -48,9 +48,11 @@ export class HomePageObject extends FtrService {
 
   async isSampleDataSetInstalled(id: string) {
     const sampleDataCard = await this.testSubjects.find(`sampleDataSetCard${id}`);
-    const deleteButton = await sampleDataCard.findAllByTestSubject(`removeSampleDataSet${id}`);
-    this.log.debug(`Sample data installed: ${deleteButton.length > 0}`);
-    return deleteButton.length > 0;
+    const installStatus = await (
+      await sampleDataCard.findByCssSelector('[data-status]')
+    ).getAttribute('data-status');
+
+    return installStatus === 'installed';
   }
 
   async isWelcomeInterstitialDisplayed() {

diff --git a/x-pack/test/functional_execution_context/tests/browser.ts b/x-pack/test/functional_execution_context/tests/browser.ts
@@ -12,8 +12,7 @@ import { assertLogContains, isExecutionContextLog, readLogFile } from '../test_u
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'home', 'timePicker']);
 
-  // FLAKY: https://github.com/elastic/kibana/issues/112103
-  describe.skip('Browser apps', () => {
+  describe('Browser apps', () => {
     let logs: Ecs[];
     const retry = getService('retry');