Work on tests

Author: flaviendelangle

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

@@ -29,6 +29,7 @@ describe('<DesktopDateRangePicker /> - Describes', () => {
     componentFamily: 'picker',
     views: ['day'],
     variant: 'desktop',
+    fieldType: 'single-input',
   }));
 
   describeConformance(<DesktopDateRangePicker />, () => ({
@@ -53,6 +54,7 @@ describe('<DesktopDateRangePicker /> - Describes', () => {
     type: 'date-range',
     variant: 'desktop',
     initialFocus: 'start',
+    fieldType: 'multi-input',
     clock,
     values: [
       // initial start and end dates
@@ -109,7 +111,7 @@ describe('<DesktopDateRangePicker /> - Describes', () => {
     type: 'date-range',
     variant: 'desktop',
     initialFocus: 'start',
-    isSingleInput: true,
+    fieldType: 'single-input',
     defaultProps: {
       slots: { field: SingleInputDateRangeField },
     },

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

@@ -29,6 +29,7 @@ describe('<DesktopDateTimeRangePicker /> - Describes', () => {
     views: ['day', 'hours', 'minutes'],
     componentFamily: 'picker',
     variant: 'desktop',
+    fieldType: 'single-input',
   }));
 
   describeConformance(<DesktopDateTimeRangePicker />, () => ({
@@ -53,6 +54,7 @@ describe('<DesktopDateTimeRangePicker /> - Describes', () => {
     type: 'date-time-range',
     variant: 'desktop',
     initialFocus: 'start',
+    fieldType: 'multi-input',
     clock,
     values: [
       // initial start and end dates

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

@@ -30,6 +30,7 @@ describe('<MobileDateRangePicker /> - Describes', () => {
     componentFamily: 'picker',
     views: ['day'],
     variant: 'mobile',
+    fieldType: 'single-input',
   }));
 
   describeConformance(<MobileDateRangePicker />, () => ({
@@ -54,6 +55,7 @@ describe('<MobileDateRangePicker /> - Describes', () => {
     type: 'date-range',
     variant: 'mobile',
     initialFocus: 'start',
+    fieldType: 'multi-input',
     clock,
     values: [
       // initial start and end dates
@@ -86,7 +88,7 @@ describe('<MobileDateRangePicker /> - Describes', () => {
       }
 
       if (!isOpened) {
-        openPicker({ type: 'date-range', initialFocus: 'start' });
+        openPicker({ type: 'date-range', initialFocus: 'start', fieldType: 'multi-input' });
       }
 
       fireEvent.click(
@@ -112,7 +114,7 @@ describe('<MobileDateRangePicker /> - Describes', () => {
     type: 'date-range',
     variant: 'mobile',
     initialFocus: 'start',
-    isSingleInput: true,
+    fieldType: 'multi-input',
     defaultProps: {
       slots: { field: SingleInputDateRangeField },
     },

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

@@ -30,6 +30,7 @@ describe('<MobileDateTimeRangePicker /> - Describes', () => {
     views: ['day', 'hours', 'minutes'],
     componentFamily: 'picker',
     variant: 'mobile',
+    fieldType: 'single-input',
   }));
 
   describeConformance(<MobileDateTimeRangePicker />, () => ({
@@ -54,6 +55,7 @@ describe('<MobileDateTimeRangePicker /> - Describes', () => {
     type: 'date-time-range',
     variant: 'mobile',
     initialFocus: 'start',
+    fieldType: 'multi-input',
     clock,
     values: [
       // initial start and end dates
@@ -89,6 +91,7 @@ describe('<MobileDateTimeRangePicker /> - Describes', () => {
         openPicker({
           type: 'date-time-range',
           initialFocus: setEndDate ? 'end' : 'start',
+          fieldType: 'multi-input',
         });
       }
       let newValue: PickerNonNullableRangeValue;
@@ -157,6 +160,7 @@ describe('<MobileDateTimeRangePicker /> - Describes', () => {
     type: 'date-time-range',
     variant: 'mobile',
     initialFocus: 'start',
+    fieldType: 'single-input',
     clock,
     values: [
       // initial start and end dates

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

@@ -24,6 +24,7 @@ describe('<MultiInputDateRangeField />', () => {
     render,
     clock,
     componentFamily: 'field',
+    fieldType: 'multi-input',
     views: ['year', 'month', 'day'],
     setValue: (value, { setEndDate } = {}) => {
       setValueOnFieldInput(adapterToUse.format(value, 'keyboardDate'), setEndDate ? 1 : 0);

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

@@ -24,6 +24,7 @@ describe('<MultiInputDateTimeRangeField />', () => {
     render,
     clock,
     componentFamily: 'field',
+    fieldType: 'multi-input',
     views: ['year', 'month', 'day', 'hours', 'minutes'],
     setValue: (value, { setEndDate } = {}) => {
       setValueOnFieldInput(adapterToUse.format(value, 'keyboardDateTime12h'), setEndDate ? 1 : 0);

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

@@ -25,6 +25,7 @@ describe('<MultiInputTimeRangeField />', () => {
     clock,
     componentFamily: 'field',
     views: ['hours', 'minutes'],
+    fieldType: 'multi-input',
     setValue: (value, { setEndDate } = {}) => {
       setValueOnFieldInput(
         adapterToUse.format(

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

@@ -21,6 +21,6 @@ describe('<SingleInputDateRangeField /> - Describes', () => {
     clock,
     componentFamily: 'field',
     views: ['year', 'month', 'day'],
-    isSingleInput: true,
+    fieldType: 'single-input',
   }));
 });

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

@@ -20,6 +20,6 @@ describe('<SingleInputDateTimeRangeField /> - Describes', () => {
     clock,
     componentFamily: 'field',
     views: ['year', 'month', 'day', 'hours', 'minutes', 'seconds'],
-    isSingleInput: true,
+    fieldType: 'single-input',
   }));
 });

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

@@ -20,6 +20,6 @@ describe('<SingleInputTimeRangeField /> - Describes', () => {
     clock,
     componentFamily: 'field',
     views: ['hours', 'minutes', 'seconds'],
-    isSingleInput: true,
+    fieldType: 'single-input',
   }));
 });

packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx

@@ -34,6 +34,7 @@ describe('<StaticDateRangePicker />', () => {
     componentFamily: 'static-picker',
     views: ['day'],
     variant: 'mobile',
+    fieldType: 'no-input',
   }));
 
   it('allows disabling dates', () => {

test/utils/pickers/describeRangeValidation/describeRangeValidation.types.ts

@@ -13,13 +13,13 @@ interface DescribeRangeValidationKeyboardOptions {
 export interface DescribeRangeValidationInputOptions
   extends DescribeValidationInputOptions,
     DescribeRangeValidationKeyboardOptions {
-  isSingleInput?: boolean;
+  fieldType: 'single-input' | 'multi-input' | 'no-input';
 }
 
 export interface DescribeRangeValidationOptions
   extends DescribeValidationOptions,
     DescribeRangeValidationKeyboardOptions {
-  isSingleInput?: boolean;
+  fieldType: 'single-input' | 'multi-input' | 'no-input';
 }
 
 export type DescribeRangeValidationTestSuite = (

test/utils/pickers/describeRangeValidation/testTextFieldKeyboardRangeValidation.tsx

@@ -6,8 +6,12 @@ import { act } from '@mui/internal-test-utils/createRenderer';
 import { describeSkipIf, testSkipIf } from 'test/utils/skipIf';
 import { DescribeRangeValidationTestSuite } from './describeRangeValidation.types';
 
-const testInvalidStatus = (expectedAnswer: boolean[], isSingleInput?: boolean) => {
-  const answers = isSingleInput ? [expectedAnswer[0] || expectedAnswer[1]] : expectedAnswer;
+const testInvalidStatus = (
+  expectedAnswer: boolean[],
+  fieldType: 'single-input' | 'multi-input' | 'no-input',
+) => {
+  const answers =
+    fieldType === 'multi-input' ? expectedAnswer : [expectedAnswer[0] || expectedAnswer[1]];
 
   const fieldInputRoots = getAllFieldInputRoot();
   answers.forEach((answer, index) => {
@@ -21,7 +25,7 @@ export const testTextFieldKeyboardRangeValidation: DescribeRangeValidationTestSu
   ElementToTest,
   getOptions,
 ) => {
-  const { componentFamily, render, isSingleInput, withDate, withTime, setValue } = getOptions();
+  const { componentFamily, render, fieldType, withDate, withTime, setValue } = getOptions();
 
   describeSkipIf(componentFamily !== 'field' || !setValue)('text field keyboard:', () => {
     // eslint-disable-next-line @typescript-eslint/no-shadow
@@ -42,7 +46,7 @@ export const testTextFieldKeyboardRangeValidation: DescribeRangeValidationTestSu
       });
       expect(onErrorMock.callCount).to.equal(1);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal(['invalidRange', 'invalidRange']);
-      testInvalidStatus([true, true], isSingleInput);
+      testInvalidStatus([true, true], fieldType);
     });
 
     testSkipIf(!withDate)('should apply shouldDisableDate', () => {
@@ -62,15 +66,15 @@ export const testTextFieldKeyboardRangeValidation: DescribeRangeValidationTestSu
       });
 
       expect(onErrorMock.callCount).to.equal(0);
-      testInvalidStatus([false, false], isSingleInput);
+      testInvalidStatus([false, false], fieldType);
 
       act(() => {
         setValue(adapterToUse.date('2018-03-13'), { setEndDate: true });
       });
 
       expect(onErrorMock.callCount).to.equal(1);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal([null, 'shouldDisableDate']);
-      testInvalidStatus([false, true], isSingleInput);
+      testInvalidStatus([false, true], fieldType);
 
       act(() => {
         setValue(adapterToUse.date('2018-03-12'));
@@ -81,15 +85,15 @@ export const testTextFieldKeyboardRangeValidation: DescribeRangeValidationTestSu
         'shouldDisableDate',
         'shouldDisableDate',
       ]);
-      testInvalidStatus([true, true], isSingleInput);
+      testInvalidStatus([true, true], fieldType);
 
       setProps({
         shouldDisableDate: (date) => adapterToUse.isBefore(date, adapterToUse.date('2018-03-13')),
       });
 
       expect(onErrorMock.callCount).to.equal(3);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal(['shouldDisableDate', null]);
-      testInvalidStatus([true, false], isSingleInput);
+      testInvalidStatus([true, false], fieldType);
     });
 
     it('should apply disablePast', () => {
@@ -114,22 +118,22 @@ export const testTextFieldKeyboardRangeValidation: DescribeRangeValidationTestSu
 
       expect(onErrorMock.callCount).to.equal(1);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal(['disablePast', null]);
-      testInvalidStatus([true, false], isSingleInput);
+      testInvalidStatus([true, false], fieldType);
 
       act(() => {
         setValue(past, { setEndDate: true });
       });
 
       expect(onErrorMock.callCount).to.equal(2);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal(['disablePast', 'disablePast']);
-      testInvalidStatus([true, true], isSingleInput);
+      testInvalidStatus([true, true], fieldType);
 
       act(() => {
         setValue(now);
       });
       expect(onErrorMock.callCount).to.equal(3);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal([null, 'disablePast']);
-      testInvalidStatus([false, true], isSingleInput);
+      testInvalidStatus([false, true], fieldType);
     });
 
     it('should apply disableFuture', () => {
@@ -155,23 +159,23 @@ export const testTextFieldKeyboardRangeValidation: DescribeRangeValidationTestSu
 
       expect(onErrorMock.callCount).to.equal(1);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal([null, 'disableFuture']);
-      testInvalidStatus([false, true], isSingleInput);
+      testInvalidStatus([false, true], fieldType);
 
       act(() => {
         setValue(future);
       });
 
       expect(onErrorMock.callCount).to.equal(2);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal(['disableFuture', 'disableFuture']);
-      testInvalidStatus([true, true], isSingleInput);
+      testInvalidStatus([true, true], fieldType);
 
       act(() => {
         setValue(now);
       });
 
       expect(onErrorMock.callCount).to.equal(3);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal([null, 'disableFuture']);
-      testInvalidStatus([false, true], isSingleInput);
+      testInvalidStatus([false, true], fieldType);
     });
 
     testSkipIf(!withDate)('should apply minDate', () => {
@@ -188,23 +192,23 @@ export const testTextFieldKeyboardRangeValidation: DescribeRangeValidationTestSu
 
       expect(onErrorMock.callCount).to.equal(2);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal(['minDate', 'minDate']);
-      testInvalidStatus([true, true], isSingleInput);
+      testInvalidStatus([true, true], fieldType);
 
       act(() => {
         setValue(adapterToUse.date('2018-03-15'));
       });
 
       expect(onErrorMock.callCount).to.equal(3);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal([null, 'minDate']);
-      testInvalidStatus([false, true], isSingleInput);
+      testInvalidStatus([false, true], fieldType);
 
       act(() => {
         setValue(adapterToUse.date('2018-03-16'), { setEndDate: true });
       });
 
       expect(onErrorMock.callCount).to.equal(4);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal([null, null]);
-      testInvalidStatus([false, false], isSingleInput);
+      testInvalidStatus([false, false], fieldType);
     });
 
     testSkipIf(!withDate)('should apply maxDate', () => {
@@ -221,15 +225,15 @@ export const testTextFieldKeyboardRangeValidation: DescribeRangeValidationTestSu
 
       expect(onErrorMock.callCount).to.equal(1);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal([null, 'maxDate']);
-      testInvalidStatus([false, true], isSingleInput);
+      testInvalidStatus([false, true], fieldType);
 
       act(() => {
         setValue(adapterToUse.date('2018-03-16'));
       });
 
       expect(onErrorMock.callCount).to.equal(2);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal(['maxDate', 'maxDate']);
-      testInvalidStatus([true, true], isSingleInput);
+      testInvalidStatus([true, true], fieldType);
     });
 
     testSkipIf(!withTime)('should apply minTime', () => {
@@ -249,23 +253,23 @@ export const testTextFieldKeyboardRangeValidation: DescribeRangeValidationTestSu
 
       expect(onErrorMock.callCount).to.equal(2);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal(['minTime', 'minTime']);
-      testInvalidStatus([true, true], isSingleInput);
+      testInvalidStatus([true, true], fieldType);
 
       act(() => {
         setValue(adapterToUse.date('2018-03-10T12:10:00'), { setEndDate: true });
       });
 
       expect(onErrorMock.callCount).to.equal(3);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal(['minTime', null]);
-      testInvalidStatus([true, false], isSingleInput);
+      testInvalidStatus([true, false], fieldType);
 
       act(() => {
         setValue(adapterToUse.date('2018-03-10T12:05:00'));
       });
 
       expect(onErrorMock.callCount).to.equal(4);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal([null, null]);
-      testInvalidStatus([false, false], isSingleInput);
+      testInvalidStatus([false, false], fieldType);
     });
 
     testSkipIf(!withTime)('should apply maxTime', () => {
@@ -285,15 +289,15 @@ export const testTextFieldKeyboardRangeValidation: DescribeRangeValidationTestSu
 
       expect(onErrorMock.callCount).to.equal(1);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal([null, 'maxTime']);
-      testInvalidStatus([false, true], isSingleInput);
+      testInvalidStatus([false, true], fieldType);
 
       act(() => {
         setValue(adapterToUse.date('2018-03-10T12:05:00'));
       });
 
       expect(onErrorMock.callCount).to.equal(2);
       expect(onErrorMock.lastCall.args[0]).to.deep.equal(['maxTime', 'maxTime']);
-      testInvalidStatus([true, true], isSingleInput);
+      testInvalidStatus([true, true], fieldType);
     });
   });
 };