rely on active element on tests

mui · Oct 10, 2024 · 5355f67 · 5355f67
1 parent cbb7216
commit 5355f67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/packages/x-date-pickers/src/DigitalClock/tests/DigitalClock.test.tsx b/packages/x-date-pickers/src/DigitalClock/tests/DigitalClock.test.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable material-ui/disallow-active-element-as-key-event-target */
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
@@ -99,11 +100,8 @@ describe('<DigitalClock />', () => {
       const options = screen.getAllByRole('option');
       const lastOptionIndex = options.length - 1;
 
-      const firstElement = options[0];
-      const lastElement = options[lastOptionIndex];
-
-      fireEvent.keyDown(firstElement, { key: 'End' }); // moves focus to last element
-      fireEvent.keyDown(lastElement, { key: 'PageUp' });
+      fireEvent.keyDown(document.activeElement!, { key: 'End' }); // moves focus to last element
+      fireEvent.keyDown(document.activeElement!, { key: 'PageUp' });
 
       expect(handleChange.callCount).to.equal(0);
       expect(document.activeElement).to.equal(options[lastOptionIndex - 5]);
@@ -150,10 +148,9 @@ describe('<DigitalClock />', () => {
       const options = screen.getAllByRole('option');
       const lastOptionIndex = options.length - 1;
 
-      const firstElement = options[0];
       const lastElement = options[lastOptionIndex];
 
-      fireEvent.keyDown(firstElement, { key: 'End' }); // moves focus to last element
+      fireEvent.keyDown(document.activeElement!, { key: 'End' }); // moves focus to last element
       // moves focus 4 steps above last item using arrow up
       [0, 1, 2].forEach((index) => {
         fireEvent.keyDown(options[lastOptionIndex - index], { key: 'ArrowUp' });

diff --git a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable material-ui/disallow-active-element-as-key-event-target */
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
@@ -114,11 +115,8 @@ describe('<MultiSectionDigitalClock />', () => {
       const hoursOptions = within(hoursSectionListbox).getAllByRole('option');
       const lastOptionIndex = hoursOptions.length - 1;
 
-      const firstElement = hoursOptions[0];
-      const lastElement = hoursOptions[lastOptionIndex];
-
-      fireEvent.keyDown(firstElement, { key: 'End' }); // moves focus to last element
-      fireEvent.keyDown(lastElement, { key: 'PageUp' });
+      fireEvent.keyDown(document.activeElement!, { key: 'End' }); // moves focus to last element
+      fireEvent.keyDown(document.activeElement!, { key: 'PageUp' });
 
       expect(handleChange.callCount).to.equal(0);
       expect(document.activeElement).to.equal(hoursOptions[lastOptionIndex - 5]);
@@ -169,10 +167,9 @@ describe('<MultiSectionDigitalClock />', () => {
       const hoursOptions = within(hoursSectionListbox).getAllByRole('option');
       const lastOptionIndex = hoursOptions.length - 1;
 
-      const firstElement = hoursOptions[0];
       const lastElement = hoursOptions[lastOptionIndex];
 
-      fireEvent.keyDown(firstElement, { key: 'End' }); // moves focus to last element
+      fireEvent.keyDown(document.activeElement!, { key: 'End' }); // moves focus to last element
       // moves focus 4 steps above last item using arrow up
       [0, 1, 2].forEach((index) => {
         fireEvent.keyDown(hoursOptions[lastOptionIndex - index], { key: 'ArrowUp' });