Merge branch 'main' into snyk-upgrade-de353905732d58fe633fb009a3665e48

elastic · Oct 5, 2023 · 052a31c · 052a31c
2 parents bf25125 + c77af6e
commit 052a31c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap b/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap
@@ -96,13 +96,6 @@ exports[`EuiComboBox renders the options list dropdown 1`] = `
                   style="inline-size: 2px;"
                   value=""
                 />
-                <span
-                  aria-live="polite"
-                  class="emotion-euiScreenReaderOnly"
-                  id="generated-id_removeOptionMessage"
-                >
-                  Combo box. Selected. Combo box input.  Type some text or, to display a list of choices, press Down Arrow. To exit the list of choices, press Escape.
-                </span>
               </div>
               <div
                 class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right euiFormControlLayoutIcons--absolute"

diff --git a/src/components/combo_box/combo_box.test.tsx b/src/components/combo_box/combo_box.test.tsx
@@ -9,7 +9,10 @@
 import React from 'react';
 import { fireEvent } from '@testing-library/react';
 import { render, showEuiComboBoxOptions } from '../../test/rtl';
-import { shouldRenderCustomStyles } from '../../test/internal';
+import {
+  shouldRenderCustomStyles,
+  testOnReactVersion,
+} from '../../test/internal';
 import { requiredProps } from '../../test';
 
 import { keys } from '../../services';
@@ -70,17 +73,21 @@ describe('EuiComboBox', () => {
     render(<EuiComboBox {...requiredProps} options={options} />);
   });
 
-  it('renders the options list dropdown', async () => {
-    const { baseElement } = render(
-      <EuiComboBox
-        options={options}
-        data-test-subj="alsoGetsAppliedToOptionsList"
-      />
-    );
-    await showEuiComboBoxOptions();
+  // React 16 for some reason doesn't snapshot the screen reader text
+  testOnReactVersion(['17', '18'])(
+    'renders the options list dropdown',
+    async () => {
+      const { baseElement } = render(
+        <EuiComboBox
+          options={options}
+          data-test-subj="alsoGetsAppliedToOptionsList"
+        />
+      );
+      await showEuiComboBoxOptions();
 
-    expect(baseElement).toMatchSnapshot();
-  });
+      expect(baseElement).toMatchSnapshot();
+    }
+  );
 
   it('renders selectedOptions as pills', () => {
     const { getAllByTestSubject } = render(