From 8a29a960692dfdb63d8cf26db8d6f4096602f4ff Mon Sep 17 00:00:00 2001
From: Brianna Hall <briannajdhall@gmail.com>
Date: Mon, 4 Oct 2021 13:24:58 -0400
Subject: [PATCH] Removed html_id_generator mocks.

Current mock was failing due to missing useGeneratedHtmlId export. This is safe to remove because EUI contains a .testenv that contains an mock for html_id_generator. More info at https://github.com/elastic/eui/blob/master/src/services/accessibility/html_id_generator.testenv.ts
---
 .../public/components/cron_editor/cron_editor.test.tsx    | 6 ------
 .../__jest__/client_integration/helpers/jest.mocks.tsx    | 6 ------
 .../field_format_editor/editors/url/url.test.tsx          | 6 ------
 .../app/error_group_overview/List/List.test.tsx           | 6 ------
 .../components/shared/Stacktrace/Stackframe.test.tsx      | 6 ------
 .../__snapshots__/asset_manager.stories.storyshot         | 8 ++++----
 .../__snapshots__/expression_input.stories.storyshot      | 2 +-
 .../__snapshots__/file_upload.stories.storyshot           | 4 ++--
 .../__snapshots__/workpad_table.stories.storyshot         | 8 ++++----
 .../components/footer/settings/settings.test.tsx          | 6 +-----
 x-pack/plugins/canvas/storybook/storyshots.test.tsx       | 7 -------
 .../license_management/__jest__/add_license.test.js       | 5 -----
 .../__jest__/request_trial_extension.test.js              | 5 -----
 .../license_management/__jest__/revert_to_basic.test.js   | 5 -----
 .../license_management/__jest__/start_trial.test.js       | 6 ------
 .../reporting/public/management/report_listing.test.tsx   | 6 ------
 .../availability_reporting.test.tsx                       | 6 ------
 .../availability_reporting/location_status_tags.test.tsx  | 6 ------
 .../overview/monitor_list/monitor_list.test.tsx           | 6 ------
 19 files changed, 12 insertions(+), 98 deletions(-)

diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx
index 26ef7483bbbbd..0ae82872124a4 100644
--- a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx
+++ b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx
@@ -14,12 +14,6 @@ import { mountWithI18nProvider } from '@kbn/test/jest';
 import { Frequency } from './types';
 import { CronEditor } from './cron_editor';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('CronEditor', () => {
   ['MINUTE', 'HOUR', 'DAY', 'WEEK', 'MONTH', 'YEAR'].forEach((unit) => {
     test(`is rendered with a ${unit} frequency`, () => {
diff --git a/src/plugins/index_pattern_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx b/src/plugins/index_pattern_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
index e291ec7b4ca08..d33a0d2a87fb5 100644
--- a/src/plugins/index_pattern_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
+++ b/src/plugins/index_pattern_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
@@ -9,12 +9,6 @@ import React from 'react';
 
 const EDITOR_ID = 'testEditor';
 
-jest.mock('@elastic/eui/lib/services/accessibility', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 jest.mock('@elastic/eui', () => {
   const original = jest.requireActual('@elastic/eui');
 
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
index 48d3a5dfea7c6..6394d42b691f1 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
@@ -15,12 +15,6 @@ import { createKibanaReactContext } from '../../../../../../kibana_react/public'
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-jest.mock('@elastic/eui/lib/services/accessibility', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 const fieldType = 'string';
 const format = {
   getConverterFor: jest
diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/List/List.test.tsx b/x-pack/plugins/apm/public/components/app/error_group_overview/List/List.test.tsx
index a2a92b7e16f8e..12fa1c955ccc8 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_overview/List/List.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_overview/List/List.test.tsx
@@ -15,12 +15,6 @@ import props from './__fixtures__/props.json';
 import { MemoryRouter } from 'react-router-dom';
 import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('ErrorGroupOverview -> List', () => {
   beforeAll(() => {
     mockMoment();
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.test.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.test.tsx
index c73d312e0cf18..6bab77dbe4970 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.test.tsx
@@ -12,12 +12,6 @@ import { mountWithTheme } from '../../../utils/testHelpers';
 import { Stackframe as StackframeComponent } from './Stackframe';
 import stacktracesMock from './__fixtures__/stacktraces.json';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('Stackframe', () => {
   describe('when stackframe has source lines', () => {
     let wrapper: ReactWrapper;
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
index 6ef6d19e446db..45b9d896db5f2 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
@@ -54,7 +54,7 @@ exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
               >
                 <input
                   accept="image/*"
-                  aria-describedby="generated-id"
+                  aria-describedby="generated-id-filePicker__prompt"
                   className="euiFilePicker__input"
                   multiple={true}
                   onChange={[Function]}
@@ -65,7 +65,7 @@ exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
                 />
                 <div
                   className="euiFilePicker__prompt"
-                  id="generated-id"
+                  id="generated-id-filePicker__prompt"
                 >
                   <span
                     aria-hidden="true"
@@ -238,7 +238,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
               >
                 <input
                   accept="image/*"
-                  aria-describedby="generated-id"
+                  aria-describedby="generated-id-filePicker__prompt"
                   className="euiFilePicker__input"
                   multiple={true}
                   onChange={[Function]}
@@ -249,7 +249,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                 />
                 <div
                   className="euiFilePicker__prompt"
-                  id="generated-id"
+                  id="generated-id-filePicker__prompt"
                 >
                   <span
                     aria-hidden="true"
diff --git a/x-pack/plugins/canvas/public/components/expression_input/__stories__/__snapshots__/expression_input.stories.storyshot b/x-pack/plugins/canvas/public/components/expression_input/__stories__/__snapshots__/expression_input.stories.storyshot
index 9c9ed566e9482..bfd08e4ab823e 100644
--- a/x-pack/plugins/canvas/public/components/expression_input/__stories__/__snapshots__/expression_input.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/expression_input/__stories__/__snapshots__/expression_input.stories.storyshot
@@ -29,7 +29,7 @@ exports[`Storyshots components/ExpressionInput default 1`] = `
               aria-label="Code Editor"
               className="kibanaCodeEditor__keyboardHint"
               data-test-subj="codeEditorHint"
-              id="generated-id"
+              id="codeEditor_generated-id"
               onBlur={[Function]}
               onClick={[Function]}
               onFocus={[Function]}
diff --git a/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot b/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
index 5fe43c95d271d..ab76e9a66a2b5 100644
--- a/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
@@ -8,7 +8,7 @@ exports[`Storyshots components/FileUpload default 1`] = `
     className="euiFilePicker__wrap"
   >
     <input
-      aria-describedby="generated-id"
+      aria-describedby="generated-id-filePicker__prompt"
       className="euiFilePicker__input"
       id=""
       onChange={[Function]}
@@ -19,7 +19,7 @@ exports[`Storyshots components/FileUpload default 1`] = `
     />
     <div
       className="euiFilePicker__prompt"
-      id="generated-id"
+      id="generated-id-filePicker__prompt"
     >
       <span
         aria-hidden="true"
diff --git a/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot b/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
index 7d05176b8147c..8b4e6026c56b5 100644
--- a/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
@@ -54,7 +54,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
           >
             <input
               accept="application/json"
-              aria-describedby="generated-id"
+              aria-describedby="generated-id-filePicker__prompt"
               aria-label="Import workpad JSON file"
               className="euiFilePicker__input"
               disabled={false}
@@ -66,7 +66,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
             />
             <div
               className="euiFilePicker__prompt"
-              id="generated-id"
+              id="generated-id-filePicker__prompt"
             >
               <span
                 aria-hidden="true"
@@ -166,7 +166,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
         </div>
         <table
           className="euiTable euiTable--responsive"
-          id="generated-id"
+          id="__table_generated-id"
           tabIndex={-1}
         >
           <caption
@@ -921,7 +921,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
                   className="euiPagination__item"
                 >
                   <button
-                    aria-controls="generated-id"
+                    aria-controls="__table_generated-id"
                     aria-current={true}
                     aria-label="Page 1 of 1"
                     className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/settings.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/settings.test.tsx
index 23d4dbbe62a8f..8be457b956be6 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/settings.test.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/settings.test.tsx
@@ -21,11 +21,7 @@ import { Settings } from './settings';
 
 jest.mock('../../../supported_renderers');
 jest.mock(`@elastic/eui/lib/components/form/form_row/make_id`, () => () => `generated-id`);
-jest.mock('@elastic/eui/lib/services/accessibility', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
+
 jest.mock('@elastic/eui/lib/components/portal/portal', () => {
   // eslint-disable-next-line @typescript-eslint/no-shadow
   const React = jest.requireActual('react');
diff --git a/x-pack/plugins/canvas/storybook/storyshots.test.tsx b/x-pack/plugins/canvas/storybook/storyshots.test.tsx
index f99a1ed5d4335..8a55c6f12bf51 100644
--- a/x-pack/plugins/canvas/storybook/storyshots.test.tsx
+++ b/x-pack/plugins/canvas/storybook/storyshots.test.tsx
@@ -51,13 +51,6 @@ jest.mock('@elastic/eui/packages/react-datepicker', () => {
 // @ts-expect-error Portal mocks are notoriously difficult to type
 ReactDOM.createPortal = jest.fn((element) => element);
 
-// Mock the EUI HTML ID Generator so elements have a predictable ID in snapshots
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 // To be resolved by EUI team.
 // https://github.com/elastic/eui/issues/3712
 jest.mock('@elastic/eui/lib/components/overlay_mask/overlay_mask', () => {
diff --git a/x-pack/plugins/license_management/__jest__/add_license.test.js b/x-pack/plugins/license_management/__jest__/add_license.test.js
index 1e36226f9174a..186601bb8d097 100644
--- a/x-pack/plugins/license_management/__jest__/add_license.test.js
+++ b/x-pack/plugins/license_management/__jest__/add_license.test.js
@@ -7,11 +7,6 @@
 
 import { AddLicense } from '../public/application/sections/license_dashboard/add_license';
 import { createMockLicense, getComponent } from './util';
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
 
 describe('AddLicense component when license is active', () => {
   test('should display correct verbiage', () => {
diff --git a/x-pack/plugins/license_management/__jest__/request_trial_extension.test.js b/x-pack/plugins/license_management/__jest__/request_trial_extension.test.js
index 5e14986ec53e1..bd6dfcc3c576f 100644
--- a/x-pack/plugins/license_management/__jest__/request_trial_extension.test.js
+++ b/x-pack/plugins/license_management/__jest__/request_trial_extension.test.js
@@ -7,11 +7,6 @@
 
 import { RequestTrialExtension } from '../public/application/sections/license_dashboard/request_trial_extension';
 import { createMockLicense, getComponent } from './util';
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
 
 describe('RequestTrialExtension component', () => {
   test('should not display when license is active and trial has not been used', () => {
diff --git a/x-pack/plugins/license_management/__jest__/revert_to_basic.test.js b/x-pack/plugins/license_management/__jest__/revert_to_basic.test.js
index ff5642f2a18db..417f3484a2d78 100644
--- a/x-pack/plugins/license_management/__jest__/revert_to_basic.test.js
+++ b/x-pack/plugins/license_management/__jest__/revert_to_basic.test.js
@@ -7,11 +7,6 @@
 
 import { RevertToBasic } from '../public/application/sections/license_dashboard/revert_to_basic';
 import { createMockLicense, getComponent } from './util';
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
 
 describe('RevertToBasic component', () => {
   test('should display when trial is active', () => {
diff --git a/x-pack/plugins/license_management/__jest__/start_trial.test.js b/x-pack/plugins/license_management/__jest__/start_trial.test.js
index e80b601952246..6dc6c95521f55 100644
--- a/x-pack/plugins/license_management/__jest__/start_trial.test.js
+++ b/x-pack/plugins/license_management/__jest__/start_trial.test.js
@@ -8,12 +8,6 @@
 import { StartTrial } from '../public/application/sections/license_dashboard/start_trial';
 import { createMockLicense, getComponent } from './util';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('StartTrial component when trial is allowed', () => {
   test('display for basic license', () => {
     const rendered = getComponent(
diff --git a/x-pack/plugins/reporting/public/management/report_listing.test.tsx b/x-pack/plugins/reporting/public/management/report_listing.test.tsx
index bdb8bdbbe5d5e..5e80c2d666c23 100644
--- a/x-pack/plugins/reporting/public/management/report_listing.test.tsx
+++ b/x-pack/plugins/reporting/public/management/report_listing.test.tsx
@@ -26,12 +26,6 @@ import { Job } from '../lib/job';
 import { InternalApiClientProvider, ReportingAPIClient } from '../lib/reporting_api_client';
 import { KibanaContextProvider } from '../shared_imports';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 interface PayloadMock {
   payload: Omit<ReportApiJSON['payload'], 'browserTimezone' | 'version' | 'layout'>;
 }
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/availability_reporting.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/availability_reporting.test.tsx
index 3b1f15dc46f77..9a33aecfd502c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/availability_reporting.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/availability_reporting.test.tsx
@@ -10,12 +10,6 @@ import { renderWithIntl, shallowWithIntl } from '@kbn/test/jest';
 import { AvailabilityReporting } from './availability_reporting';
 import { StatusTag } from './location_status_tags';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('AvailabilityReporting component', () => {
   let allLocations: StatusTag[];
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
index 6b3cc23465833..4d5a613c557b6 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
@@ -13,12 +13,6 @@ import { mockMoment } from '../../../../lib/helper/test_helpers';
 
 mockMoment();
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('LocationStatusTags component', () => {
   let monitorLocations: MonitorLocation[];
 
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
index 3a32d8c943af6..cc0501a670ae8 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
@@ -24,12 +24,6 @@ import { mockMoment } from '../../../lib/helper/test_helpers';
 import { render } from '../../../lib/helper/rtl_helpers';
 import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 const testFooPings: Ping[] = [
   makePing({
     docId: 'foo1',