[htmlIdGenerator] testenv mock (#4212)

* htmlIdGenerator testenv mock * update jest env * CL
elastic · Nov 11, 2020 · cbb2601 · cbb2601
1 parent 3f6ff37
commit cbb2601
Show file tree

Hide file tree

Showing 46 changed files with 229 additions and 321 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## [`master`](https://github.com/elastic/eui/tree/master)
 
-No public interface changes since `30.3.0`.
+- Added `testenv` mock for `htmlIdGenerator` ([#4212](https://github.com/elastic/eui/pull/4212)) 
 
 ## [`30.3.0`](https://github.com/elastic/eui/tree/v30.3.0)
 

diff --git a/scripts/jest/setup/mocks.js b/scripts/jest/setup/mocks.js
@@ -21,4 +21,10 @@
 jest.mock('./../../../src/components/icon', () => {
   const { EuiIcon } = require('./../../../src/components/icon/icon.testenv');
   return { EuiIcon }
+});
+
+jest.mock('./../../../src/services/accessibility', () => {
+  const a11y = jest.requireActual('./../../../src/services/accessibility');
+  const { htmlIdGenerator } = require('./../../../src/services/accessibility/html_id_generator.testenv');
+  return { ...a11y, htmlIdGenerator }
 });
diff --git a/src/components/accordion/accordion.test.tsx b/src/components/accordion/accordion.test.tsx
@@ -23,10 +23,6 @@ import { requiredProps } from '../../test/required_props';
 
 import { EuiAccordion } from './accordion';
 
-jest.mock('./../../services/accessibility', () => ({
-  htmlIdGenerator: () => () => 'generated-id',
-}));
-
 let id = 0;
 const getId = () => `${id++}`;
 

diff --git a/src/components/basic_table/__snapshots__/basic_table.test.tsx.snap b/src/components/basic_table/__snapshots__/basic_table.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`EuiBasicTable cellProps renders cells with custom props from a callback
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -144,7 +144,7 @@ exports[`EuiBasicTable cellProps renders rows with custom props from an object 1
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -270,7 +270,7 @@ exports[`EuiBasicTable empty is rendered 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -338,7 +338,7 @@ exports[`EuiBasicTable empty renders a node as a custom message 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -414,7 +414,7 @@ exports[`EuiBasicTable empty renders a string as a custom message 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -482,7 +482,7 @@ exports[`EuiBasicTable footers do not render without a column footer definition
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -716,7 +716,7 @@ exports[`EuiBasicTable footers render with pagination, selection, sorting, and f
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -984,7 +984,7 @@ exports[`EuiBasicTable footers render with pagination, selection, sorting, and f
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -1018,7 +1018,7 @@ exports[`EuiBasicTable itemIdToExpandedRowMap renders an expanded row 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -1147,7 +1147,7 @@ exports[`EuiBasicTable rowProps renders rows with custom props from a callback 1
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -1277,7 +1277,7 @@ exports[`EuiBasicTable rowProps renders rows with custom props from an object 1`
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -1504,13 +1504,13 @@ exports[`EuiBasicTable with initial selection 1`] = `
         </div>
       </EuiTableHeaderMobile>
       <EuiTable
-        id="generated-id"
+        id="__table_generated-id"
         responsive={true}
         tableLayout="fixed"
       >
         <table
           className="euiTable euiTable--responsive"
-          id="generated-id"
+          id="__table_generated-id"
           tabIndex={-1}
         >
           <EuiScreenReaderOnly>
@@ -1923,7 +1923,7 @@ exports[`EuiBasicTable with multiple record actions with custom availability 1`]
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -2232,7 +2232,7 @@ exports[`EuiBasicTable with pagination - 2nd page 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -2310,7 +2310,7 @@ exports[`EuiBasicTable with pagination - 2nd page 1`] = `
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -2344,7 +2344,7 @@ exports[`EuiBasicTable with pagination 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -2440,7 +2440,7 @@ exports[`EuiBasicTable with pagination 1`] = `
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -2474,7 +2474,7 @@ exports[`EuiBasicTable with pagination and error 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -2557,7 +2557,7 @@ exports[`EuiBasicTable with pagination and selection 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -2696,7 +2696,7 @@ exports[`EuiBasicTable with pagination and selection 1`] = `
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -2730,7 +2730,7 @@ exports[`EuiBasicTable with pagination, hiding the per page options 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -2826,7 +2826,7 @@ exports[`EuiBasicTable with pagination, hiding the per page options 1`] = `
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -2882,7 +2882,7 @@ exports[`EuiBasicTable with pagination, selection and sorting 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -3024,7 +3024,7 @@ exports[`EuiBasicTable with pagination, selection and sorting 1`] = `
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -3079,7 +3079,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and a single record a
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -3314,7 +3314,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and a single record a
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -3369,7 +3369,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and column dataType 1
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -3511,7 +3511,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and column dataType 1
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -3566,7 +3566,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and column renderer 1
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -3708,7 +3708,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and column renderer 1
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -3763,7 +3763,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and multiple record a
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -4016,7 +4016,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and multiple record a
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -4071,7 +4071,7 @@ exports[`EuiBasicTable with pagination, selection, sorting, column renderer and
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -4213,7 +4213,7 @@ exports[`EuiBasicTable with pagination, selection, sorting, column renderer and
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     onPageChange={[Function]}
     onPageSizeChange={[Function]}
     pagination={
@@ -4247,7 +4247,7 @@ exports[`EuiBasicTable with sortable columns and sorting disabled 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -4376,7 +4376,7 @@ exports[`EuiBasicTable with sorting 1`] = `
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
@@ -4508,7 +4508,7 @@ exports[`EuiBasicTable with sorting enabled and enable all columns for sorting 1
       </EuiFlexGroup>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >

diff --git a/src/components/basic_table/__snapshots__/default_item_action.test.tsx.snap b/src/components/basic_table/__snapshots__/default_item_action.test.tsx.snap
@@ -43,15 +43,15 @@ exports[`DefaultItemAction render - icon 1`] = `
   position="top"
 >
   <EuiButtonIcon
-    aria-labelledby="random_id"
+    aria-labelledby="generated-id"
     color="primary"
     iconType="trash"
     isDisabled={false}
     onClick={[Function]}
   />
   <EuiScreenReaderOnly>
     <span
-      id="random_id"
+      id="generated-id"
     >
       <span>
         action1