From 5d01f830efc7018b309027178918427298005222 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 28 Feb 2024 16:43:25 +0200 Subject: [PATCH] Code review: Michel --- .../describeRangeValidation/testDayViewRangeValidation.tsx | 4 ++-- .../pickers/describeValue/testControlledUnControlled.tsx | 7 ++----- test/utils/pickers/describeValue/testPickerActionBar.tsx | 2 +- .../pickers/describeValue/testPickerOpenCloseLifeCycle.tsx | 2 +- test/utils/pickers/openPicker.ts | 6 +++--- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/test/utils/pickers/describeRangeValidation/testDayViewRangeValidation.tsx b/test/utils/pickers/describeRangeValidation/testDayViewRangeValidation.tsx index 78c0c987506ca..fc1a3865ab935 100644 --- a/test/utils/pickers/describeRangeValidation/testDayViewRangeValidation.tsx +++ b/test/utils/pickers/describeRangeValidation/testDayViewRangeValidation.tsx @@ -3,10 +3,10 @@ import { expect } from 'chai'; import { screen } from '@mui-internal/test-utils'; import { adapterToUse } from 'test/utils/pickers'; -const isDisable = (el: HTMLElement) => el.getAttribute('disabled') !== null; +const isDisabled = (el: HTMLElement) => el.getAttribute('disabled') !== null; const testDisabledDate = (day: string, expectedAnswer: boolean[], isSingleCalendar: boolean) => { - expect(screen.getAllByRole('gridcell', { name: day }).map(isDisable)).to.deep.equal( + expect(screen.getAllByRole('gridcell', { name: day }).map(isDisabled)).to.deep.equal( isSingleCalendar ? expectedAnswer.slice(0, 1) : expectedAnswer, ); }; diff --git a/test/utils/pickers/describeValue/testControlledUnControlled.tsx b/test/utils/pickers/describeValue/testControlledUnControlled.tsx index 29e4c3f5e5553..493b9c66cce40 100644 --- a/test/utils/pickers/describeValue/testControlledUnControlled.tsx +++ b/test/utils/pickers/describeValue/testControlledUnControlled.tsx @@ -28,7 +28,7 @@ export const testControlledUnControlled: DescribeValueTestSuite = ( const params = pickerParams as DescribeValueOptions<'picker', any>; - const isRangeType = ['date-range', 'date-time-range'].includes(params.type); + const isRangeType = params.type === 'date-range' || params.type === 'date-time-range'; const isDesktopRange = params.variant === 'desktop' && isRangeType; describe('Controlled / uncontrolled value', () => { @@ -257,10 +257,7 @@ export const testControlledUnControlled: DescribeValueTestSuite = ( expect(fieldRoot).to.have.class(inputBaseClasses.error); expect(fieldRoot).to.have.attribute('aria-invalid', 'true'); - if ( - (params.type === 'date-range' || params.type === 'date-time-range') && - !params.isSingleInput - ) { + if (isRangeType && !params.isSingleInput) { const fieldRootEnd = getFieldInputRoot(1); expect(fieldRootEnd).to.have.class(inputBaseClasses.error); expect(fieldRootEnd).to.have.attribute('aria-invalid', 'true'); diff --git a/test/utils/pickers/describeValue/testPickerActionBar.tsx b/test/utils/pickers/describeValue/testPickerActionBar.tsx index 4070b908da148..c58458a917764 100644 --- a/test/utils/pickers/describeValue/testPickerActionBar.tsx +++ b/test/utils/pickers/describeValue/testPickerActionBar.tsx @@ -27,7 +27,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( return; } - const isRangeType = ['date-range', 'date-time-range'].includes(pickerParams.type); + const isRangeType = pickerParams.type === 'date-range' || pickerParams.type === 'date-time-range'; describe('Picker action bar', () => { describe('clear action', () => { diff --git a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx index e376828605274..24ef112fc206b 100644 --- a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx +++ b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx @@ -16,7 +16,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite return; } - const isRangeType = ['date-range', 'date-time-range'].includes(pickerParams.type); + const isRangeType = pickerParams.type === 'date-range' || pickerParams.type === 'date-time-range'; const viewWrapperRole = isRangeType && pickerParams.variant === 'desktop' ? 'tooltip' : 'dialog'; describe('Picker open / close lifecycle', () => { diff --git a/test/utils/pickers/openPicker.ts b/test/utils/pickers/openPicker.ts index 5ad7f221dc520..2de6210fca38c 100644 --- a/test/utils/pickers/openPicker.ts +++ b/test/utils/pickers/openPicker.ts @@ -18,12 +18,12 @@ export type OpenPickerParams = }; export const openPicker = (params: OpenPickerParams) => { - const isRangePicker = params.type === 'date-range' || params.type === 'date-time-range'; + const isRangeType = params.type === 'date-range' || params.type === 'date-time-range'; const fieldSectionsContainer = getFieldSectionsContainer( - isRangePicker && !params.isSingleInput && params.initialFocus === 'end' ? 1 : 0, + isRangeType && !params.isSingleInput && params.initialFocus === 'end' ? 1 : 0, ); - if (isRangePicker) { + if (isRangeType) { userEvent.mousePress(fieldSectionsContainer); if (params.isSingleInput && params.initialFocus === 'end') {