Updated Cypress functional test.

elastic · Apr 17, 2024 · 2a16967 · 2a16967
1 parent 03b4edb
commit 2a16967
Showing 1 changed file with 6 additions and 29 deletions.
diff --git a/src/components/accordion/accordion.spec.tsx b/src/components/accordion/accordion.spec.tsx
@@ -47,31 +47,25 @@ describe('EuiAccordion', () => {
       cy.realMount(<EuiAccordion {...sharedProps} />);
       cy.realPress('Tab');
       cy.realPress('Enter');
-      cy.realPress(['Shift', 'Tab']);
       cy.focused().invoke('attr', 'aria-expanded').should('equal', 'true');
       cy.realPress('Space');
       cy.focused().invoke('attr', 'aria-expanded').should('equal', 'false');
     });
   });
 
   describe('focus management', () => {
-    const expectChildrenIsFocused = () => {
-      cy.focused()
-        .should('have.class', 'euiAccordion__childWrapper')
-        .should('have.attr', 'tabindex', '-1');
-    };
-
-    it('focuses the accordion content when the arrow is clicked', () => {
+    it('maintains focus when the button is clicked', () => {
       cy.realMount(<EuiAccordion {...sharedProps} />);
-      cy.get('.euiAccordion__arrow').realClick();
-      expectChildrenIsFocused();
+      cy.get('.euiAccordion__button').realClick();
+      cy.focused().should('have.class', 'euiAccordion__button');
     });
 
-    it('focuses the accordion content when the button is clicked', () => {
+    it('maintains focus when the button is pressed', () => {
       cy.realMount(<EuiAccordion {...sharedProps} />);
       cy.realPress('Tab');
+      cy.focused().should('have.class', 'euiAccordion__button');
       cy.focused().contains('Click me to toggle').realPress('Enter');
-      expectChildrenIsFocused();
+      cy.focused().should('have.class', 'euiAccordion__button');
     });
 
     describe('forceState', () => {
@@ -112,23 +106,6 @@ describe('EuiAccordion', () => {
           .should('not.have.class', 'euiAccordion__childWrapper')
           .should('have.attr', 'data-test-subj', 'toggleForceState');
       });
-
-      it('attempts to focus the accordion children when `onToggle` controls `forceState`', () => {
-        const ControlledComponent = () => {
-          const [accordionOpen, setAccordionOpen] = useState(false);
-          return (
-            <EuiAccordion
-              {...sharedProps}
-              onToggle={(open) => setAccordionOpen(open)}
-              forceState={accordionOpen ? 'open' : 'closed'}
-            />
-          );
-        };
-        cy.realMount(<ControlledComponent />);
-
-        cy.contains('Click me to toggle').realClick();
-        expectChildrenIsFocused();
-      });
     });
   });
 });