Skip to content

Commit 3a82a3c

Browse files
committed
Update tests
1 parent bfc984e commit 3a82a3c

File tree

3 files changed

+15
-31
lines changed

3 files changed

+15
-31
lines changed

packages/x-date-pickers/src/MobileDateTimePicker/tests/MobileDateTimePicker.test.tsx

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
import * as React from 'react';
22
import { expect } from 'chai';
33
import { spy } from 'sinon';
4-
import { fireEvent, fireTouchChangedEvent, screen } from '@mui/internal-test-utils';
4+
import { fireEvent, screen } from '@mui/internal-test-utils';
55
import { MobileDateTimePicker } from '@mui/x-date-pickers/MobileDateTimePicker';
6-
import {
7-
adapterToUse,
8-
createPickerRenderer,
9-
openPicker,
10-
getClockTouchEvent,
11-
} from 'test/utils/pickers';
6+
import { adapterToUse, createPickerRenderer, openPicker } from 'test/utils/pickers';
127
import { hasTouchSupport, testSkipIf } from 'test/utils/skipIf';
138

149
describe('<MobileDateTimePicker />', () => {
@@ -119,18 +114,14 @@ describe('<MobileDateTimePicker />', () => {
119114
expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2010, 0, 15));
120115

121116
// Change the hours
122-
const hourClockEvent = getClockTouchEvent(11, '12hours');
123-
fireTouchChangedEvent(screen.getByTestId('clock'), 'touchmove', hourClockEvent);
124-
fireTouchChangedEvent(screen.getByTestId('clock'), 'touchend', hourClockEvent);
117+
fireEvent.click(screen.getByRole('option', { name: '11 hours' }));
125118
expect(onChange.callCount).to.equal(3);
126119
expect(onChange.lastCall.args[0]).toEqualDateTime(adapterToUse.date('2010-01-15T11:00:00'));
127120

128121
// Change the minutes
129-
const minuteClockEvent = getClockTouchEvent(53, 'minutes');
130-
fireTouchChangedEvent(screen.getByTestId('clock'), 'touchmove', minuteClockEvent);
131-
fireTouchChangedEvent(screen.getByTestId('clock'), 'touchend', minuteClockEvent);
122+
fireEvent.click(screen.getByRole('option', { name: '55 minutes' }));
132123
expect(onChange.callCount).to.equal(4);
133-
expect(onChange.lastCall.args[0]).toEqualDateTime(adapterToUse.date('2010-01-15T11:53:00'));
124+
expect(onChange.lastCall.args[0]).toEqualDateTime(adapterToUse.date('2010-01-15T11:55:00'));
134125
expect(onAccept.callCount).to.equal(0);
135126
expect(onClose.callCount).to.equal(0);
136127
});

packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import * as React from 'react';
2-
import { screen, fireEvent, fireTouchChangedEvent } from '@mui/internal-test-utils';
2+
import { screen, fireEvent } from '@mui/internal-test-utils';
33
import {
44
createPickerRenderer,
55
adapterToUse,
66
expectFieldValueV7,
77
openPicker,
8-
getClockTouchEvent,
98
describeValidation,
109
describeValue,
1110
describePicker,
@@ -82,22 +81,16 @@ describe('<MobileDateTimePicker /> - Describes', () => {
8281
screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }),
8382
);
8483
const hasMeridiem = adapterToUse.is12HourCycleInCurrentLocale();
85-
// change hours
86-
const hourClockEvent = getClockTouchEvent(
87-
adapterToUse.getHours(newValue),
88-
hasMeridiem ? '12hours' : '24hours',
84+
const hours = adapterToUse.format(newValue, hasMeridiem ? 'hours12h' : 'hours24h');
85+
const hoursNumber = adapterToUse.getHours(newValue);
86+
fireEvent.click(screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }));
87+
fireEvent.click(
88+
screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue)} minutes` }),
8989
);
90-
fireTouchChangedEvent(screen.getByTestId('clock'), 'touchmove', hourClockEvent);
91-
fireTouchChangedEvent(screen.getByTestId('clock'), 'touchend', hourClockEvent);
92-
// change minutes
93-
const minutesClockEvent = getClockTouchEvent(adapterToUse.getMinutes(newValue), 'minutes');
94-
fireTouchChangedEvent(screen.getByTestId('clock'), 'touchmove', minutesClockEvent);
95-
fireTouchChangedEvent(screen.getByTestId('clock'), 'touchend', minutesClockEvent);
96-
9790
if (hasMeridiem) {
98-
const newHours = adapterToUse.getHours(newValue);
99-
// select appropriate meridiem
100-
fireEvent.click(screen.getByRole('button', { name: newHours >= 12 ? 'PM' : 'AM' }));
91+
// meridiem is an extra view on `DesktopDateTimePicker`
92+
// we need to click it to finish selection
93+
fireEvent.click(screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }));
10194
}
10295

10396
// Close the picker

packages/x-date-pickers/src/StaticDateTimePicker/tests/StaticDateTimePicker.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('<StaticDateTimePicker />', () => {
1818
fireEvent.click(screen.getByRole('gridcell', { name: '1' }));
1919
expect(onChange.callCount).to.equal(1);
2020

21-
expect(screen.getByLabelText(/Selected time/)).toBeVisible();
21+
expect(screen.getByLabelText('35 minutes')).toBeVisible();
2222
});
2323

2424
describe('Component slot: Tabs', () => {

0 commit comments

Comments
 (0)