Merge branch 'main' into more-region-cleanup

cee-chen · web-flow · commit ee1e90fc53f9 · 2023-10-27T15:58:57.000-07:00
diff --git a/src/components/accordion/accordion.spec.tsx b/src/components/accordion/accordion.spec.tsx
@@ -75,14 +75,17 @@ describe('EuiAccordion', () => {
     });
 
     describe('forceState', () => {
-      it('does not focus the accordion when `forceState` prevents the accordion from opening', () => {
-        cy.realMount(<EuiAccordion {...sharedProps} forceState="closed" />);
+      if (!React.version.startsWith('16')) {
+        // React 16 is super flaky for this test and can't find cy.focused() half the time
+        it('does not focus the accordion when `forceState` prevents the accordion from opening', () => {
+          cy.realMount(<EuiAccordion {...sharedProps} forceState="closed" />);
 
-        cy.contains('Click me to toggle').realClick();
-        cy.focused()
-          .should('not.have.class', 'euiAccordion__childWrapper')
-          .contains('Click me to toggle');
-      });
+          cy.contains('Click me to toggle').realClick();
+          cy.focused()
+            .should('not.have.class', 'euiAccordion__childWrapper')
+            .contains('Click me to toggle');
+        });
+      }
 
       it('does not focus the accordion when programmatically toggled from outside the accordion', () => {
         const ControlledComponent = () => {
