diff --git a/e2e/src/pages/helper.ts b/e2e/src/pages/helper.ts index fc1d397a..f2c45c0c 100644 --- a/e2e/src/pages/helper.ts +++ b/e2e/src/pages/helper.ts @@ -56,8 +56,8 @@ export async function fillDate( await pickerModal .getByRole('button', { name: /switch to year view/ }) .click(); - await pickerModal.getByRole('button', { name: `${year}` }).click(); - await pickerModal.getByRole('button', { name: `${monthLabel}` }).click(); + await pickerModal.getByRole('radio', { name: `${year}` }).click(); + await pickerModal.getByRole('radio', { name: `${monthLabel}` }).click(); if (day !== undefined) { // There might be a transition between two month views, therefore we wait diff --git a/matrix-meetings-widget/package.json b/matrix-meetings-widget/package.json index 55f44a45..a0725b79 100644 --- a/matrix-meetings-widget/package.json +++ b/matrix-meetings-widget/package.json @@ -18,7 +18,7 @@ "@mui/lab": "^5.0.0-alpha.140", "@mui/material": "^5.13.4", "@mui/utils": "^5.13.1", - "@mui/x-date-pickers": "^6.13.0", + "@mui/x-date-pickers": "^6.16.1", "@reduxjs/toolkit": "^1.9.7", "i18next": "^23.4.5", "i18next-chained-backend": "^4.5.0", diff --git a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarDayPicker.test.tsx b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarDayPicker.test.tsx index 4cb72b64..e2c67f3d 100644 --- a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarDayPicker.test.tsx +++ b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarDayPicker.test.tsx @@ -104,8 +104,10 @@ describe('', () => { }), ); - await userEvent.click(within(dialog).getByRole('button', { name: '2023' })); - await userEvent.click(within(dialog).getByRole('button', { name: 'Jan' })); + await userEvent.click(within(dialog).getByRole('radio', { name: '2023' })); + await userEvent.click( + within(dialog).getByRole('radio', { name: 'January' }), + ); await userEvent.click(within(dialog).getByRole('gridcell', { name: '13' })); expect(onRangeChange).toBeCalledTimes(1); diff --git a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarMonthPicker.test.tsx b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarMonthPicker.test.tsx index 9569f8c3..259b31aa 100644 --- a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarMonthPicker.test.tsx +++ b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarMonthPicker.test.tsx @@ -104,8 +104,8 @@ describe('', () => { }), ); - await userEvent.click(within(dialog).getByRole('button', { name: '2023' })); - await userEvent.click(within(dialog).getByRole('button', { name: 'Mar' })); + await userEvent.click(within(dialog).getByRole('radio', { name: '2023' })); + await userEvent.click(within(dialog).getByRole('radio', { name: 'March' })); expect(onRangeChange).toBeCalledTimes(1); expect(onRangeChange).toHaveBeenLastCalledWith( diff --git a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWeekPicker.test.tsx b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWeekPicker.test.tsx index 92cff468..d0e2114d 100644 --- a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWeekPicker.test.tsx +++ b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWeekPicker.test.tsx @@ -104,8 +104,10 @@ describe('', () => { }), ); - await userEvent.click(within(dialog).getByRole('button', { name: '2023' })); - await userEvent.click(within(dialog).getByRole('button', { name: 'Jan' })); + await userEvent.click(within(dialog).getByRole('radio', { name: '2023' })); + await userEvent.click( + within(dialog).getByRole('radio', { name: 'January' }), + ); await userEvent.click(within(dialog).getByRole('gridcell', { name: '13' })); expect(onRangeChange).toBeCalledTimes(1); diff --git a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWorkWeekPicker.test.tsx b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWorkWeekPicker.test.tsx index e240e197..1ff8e55c 100644 --- a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWorkWeekPicker.test.tsx +++ b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWorkWeekPicker.test.tsx @@ -103,8 +103,10 @@ describe('', () => { }), ); - await userEvent.click(within(dialog).getByRole('button', { name: '2023' })); - await userEvent.click(within(dialog).getByRole('button', { name: 'Jan' })); + await userEvent.click(within(dialog).getByRole('radio', { name: '2023' })); + await userEvent.click( + within(dialog).getByRole('radio', { name: 'January' }), + ); await userEvent.click(within(dialog).getByRole('gridcell', { name: '13' })); expect(onRangeChange).toBeCalledTimes(1); diff --git a/matrix-meetings-widget/src/components/common/DateTimePickers/DateRangePicker.test.tsx b/matrix-meetings-widget/src/components/common/DateTimePickers/DateRangePicker.test.tsx index 450fb76b..bdcf826c 100644 --- a/matrix-meetings-widget/src/components/common/DateTimePickers/DateRangePicker.test.tsx +++ b/matrix-meetings-widget/src/components/common/DateTimePickers/DateRangePicker.test.tsx @@ -132,8 +132,8 @@ describe('', () => { }), ); - await userEvent.click(screen.getByRole('button', { name: '2022' })); - await userEvent.click(screen.getByRole('button', { name: 'Jan' })); + await userEvent.click(screen.getByRole('radio', { name: '2022' })); + await userEvent.click(screen.getByRole('radio', { name: 'January' })); await userEvent.click(screen.getByRole('gridcell', { name: '13' })); await userEvent.click(screen.getByRole('gridcell', { name: '20' })); @@ -166,8 +166,8 @@ describe('', () => { }), ); - await userEvent.click(screen.getByRole('button', { name: '2022' })); - await userEvent.click(screen.getByRole('button', { name: 'Jan' })); + await userEvent.click(screen.getByRole('radio', { name: '2022' })); + await userEvent.click(screen.getByRole('radio', { name: 'January' })); await userEvent.click(screen.getByRole('gridcell', { name: '15' })); await userEvent.keyboard('{escape}'); @@ -205,8 +205,8 @@ describe('', () => { }), ); - await userEvent.click(screen.getByRole('button', { name: '2022' })); - await userEvent.click(screen.getByRole('button', { name: 'Jan' })); + await userEvent.click(screen.getByRole('radio', { name: '2022' })); + await userEvent.click(screen.getByRole('radio', { name: 'January' })); await userEvent.click(screen.getByRole('gridcell', { name: '15' })); await userEvent.click(screen.getByRole('gridcell', { name: '15' })); @@ -239,8 +239,8 @@ describe('', () => { }), ); - await userEvent.click(screen.getByRole('button', { name: '2022' })); - await userEvent.click(screen.getByRole('button', { name: 'Jan' })); + await userEvent.click(screen.getByRole('radio', { name: '2022' })); + await userEvent.click(screen.getByRole('radio', { name: 'January' })); await userEvent.click(screen.getByRole('gridcell', { name: '15' })); expect(screen.getByRole('gridcell', { name: '14' })).toBeDisabled(); diff --git a/matrix-meetings-widget/src/components/meetings/MeetingsFilter/MeetingsFilter.test.tsx b/matrix-meetings-widget/src/components/meetings/MeetingsFilter/MeetingsFilter.test.tsx index b4a65889..2f2a9073 100644 --- a/matrix-meetings-widget/src/components/meetings/MeetingsFilter/MeetingsFilter.test.tsx +++ b/matrix-meetings-widget/src/components/meetings/MeetingsFilter/MeetingsFilter.test.tsx @@ -81,8 +81,8 @@ describe('', () => { }), ); - await userEvent.click(screen.getByRole('button', { name: '2022' })); - await userEvent.click(screen.getByRole('button', { name: 'Jan' })); + await userEvent.click(screen.getByRole('radio', { name: '2022' })); + await userEvent.click(screen.getByRole('radio', { name: 'January' })); await userEvent.click(screen.getByRole('gridcell', { name: '13' })); await userEvent.click(screen.getByRole('gridcell', { name: '20' })); diff --git a/yarn.lock b/yarn.lock index a85a963f..6cd14280 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1099,10 +1099,10 @@ core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.19.4", "@babel/runtime@^7.20.1", "@babel/runtime@^7.20.6", "@babel/runtime@^7.21.0", "@babel/runtime@^7.21.5", "@babel/runtime@^7.22.10", "@babel/runtime@^7.22.15", "@babel/runtime@^7.22.5", "@babel/runtime@^7.22.6", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8" - integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA== +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.19.4", "@babel/runtime@^7.20.1", "@babel/runtime@^7.20.6", "@babel/runtime@^7.21.0", "@babel/runtime@^7.21.5", "@babel/runtime@^7.22.15", "@babel/runtime@^7.22.5", "@babel/runtime@^7.22.6", "@babel/runtime@^7.23.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.23.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.1.tgz#72741dc4d413338a91dcb044a86f3c0bc402646d" + integrity sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g== dependencies: regenerator-runtime "^0.14.0" @@ -1703,7 +1703,7 @@ "@floating-ui/core" "^1.4.1" "@floating-ui/utils" "^0.1.1" -"@floating-ui/react-dom@^2.0.1": +"@floating-ui/react-dom@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.0.2.tgz#fab244d64db08e6bed7be4b5fcce65315ef44d20" integrity sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ== @@ -2144,20 +2144,18 @@ prop-types "^15.8.1" react-is "^18.2.0" -"@mui/base@^5.0.0-alpha.87": - version "5.0.0-beta.14" - resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.14.tgz#315b67b0fd231cbd47e8d54f8f92be23122e4d66" - integrity sha512-Je/9JzzYObsuLCIClgE8XvXNFb55IEz8n2NtStUfASfNiVrwiR8t6VVFFuhofehkyTIN34tq1qbBaOjCnOovBw== +"@mui/base@^5.0.0-beta.17": + version "5.0.0-beta.18" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.18.tgz#f95d393cf80974e77c0823170cc15c854d5af84b" + integrity sha512-e9ZCy/ndhyt5MTshAS3qAUy/40UiO0jX+kAo6a+XirrPJE+rrQW+mKPSI0uyp+5z4Vh+z0pvNoJ2S2gSrNz3BQ== dependencies: - "@babel/runtime" "^7.22.10" - "@emotion/is-prop-valid" "^1.2.1" - "@floating-ui/react-dom" "^2.0.1" - "@mui/types" "^7.2.4" - "@mui/utils" "^5.14.8" + "@babel/runtime" "^7.23.1" + "@floating-ui/react-dom" "^2.0.2" + "@mui/types" "^7.2.5" + "@mui/utils" "^5.14.12" "@popperjs/core" "^2.11.8" clsx "^2.0.0" prop-types "^15.8.1" - react-is "^18.2.0" "@mui/core-downloads-tracker@^5.14.5": version "5.14.5" @@ -2241,26 +2239,30 @@ resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.4.tgz#b6fade19323b754c5c6de679a38f068fd50b9328" integrity sha512-LBcwa8rN84bKF+f5sDyku42w1NTxaPgPyYKODsh01U1fVstTClbUoSA96oyRBnSNyEiAVjKm6Gwx9vjR+xyqHA== -"@mui/utils@^5.13.1", "@mui/utils@^5.14.5", "@mui/utils@^5.14.7", "@mui/utils@^5.14.8": - version "5.14.8" - resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.14.8.tgz#e1737d5fcd54aa413d6b1aaea3ea670af2919402" - integrity sha512-1Ls2FfyY2yVSz9NEqedh3J8JAbbZAnUWkOWLE2f4/Hc4T5UWHMfzBLLrCqExfqyfyU+uXYJPGeNIsky6f8Gh5Q== +"@mui/types@^7.2.5": + version "7.2.5" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.5.tgz#cd62a1fc5eb1044137ccab2053b431dd7cfc3cb8" + integrity sha512-S2BwfNczr7VwS6ki8GoAXJyARoeSJDLuxOEPs3vEMyTALlf9PrdHv+sluX7kk3iKrCg/ML2mIWwapZvWbkMCQA== + +"@mui/utils@^5.13.1", "@mui/utils@^5.14.11", "@mui/utils@^5.14.12", "@mui/utils@^5.14.5": + version "5.14.12" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.14.12.tgz#58b570839e22e0fba71e17d37d9c083fe233704d" + integrity sha512-RFNXnhKQlzIkIUig6mmv0r5VbtjPdWoaBPYicq25LETdZux59HAqoRdWw15T7lp3c7gXOoE8y67+hTB8C64m2g== dependencies: - "@babel/runtime" "^7.22.10" - "@types/prop-types" "^15.7.5" - "@types/react-is" "^18.2.1" + "@babel/runtime" "^7.23.1" + "@types/prop-types" "^15.7.7" prop-types "^15.8.1" react-is "^18.2.0" -"@mui/x-date-pickers@^6.13.0": - version "6.13.0" - resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-6.13.0.tgz#de9acfbc7697aed2bcbea6996173b45e3f0ee0d5" - integrity sha512-mNfWXrS9PMLI+lgeEw6R08g5j1Yewat+A7MiI2QuwZteX3b83JQnm73RCGrSFTpvOP1/v6yIBPbxPZin5eu6GA== +"@mui/x-date-pickers@^6.16.1": + version "6.16.1" + resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-6.16.1.tgz#76341384ef51db5f405f779fe5f2e9456b2cdc53" + integrity sha512-4B2+DU7aywYdvmr10o2qai6kbbR26zta/v1y8x3bmTilI/KcbhZ2OlsyArPKmTRNC8VYirejSnhLkPR/+JIkPg== dependencies: - "@babel/runtime" "^7.22.15" - "@mui/base" "^5.0.0-alpha.87" - "@mui/utils" "^5.14.7" - "@types/react-transition-group" "^4.4.6" + "@babel/runtime" "^7.23.1" + "@mui/base" "^5.0.0-beta.17" + "@mui/utils" "^5.14.11" + "@types/react-transition-group" "^4.4.7" clsx "^2.0.0" prop-types "^15.8.1" react-transition-group "^4.4.5" @@ -3026,11 +3028,16 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.4.tgz#5d9b63132df54d8909fce1c3f8ca260fdd693e17" integrity sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA== -"@types/prop-types@*", "@types/prop-types@^15.7.5": +"@types/prop-types@*": version "15.7.5" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== +"@types/prop-types@^15.7.7": + version "15.7.8" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.8.tgz#805eae6e8f41bd19e88917d2ea200dc992f405d3" + integrity sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ== + "@types/q@^1.5.1": version "1.5.4" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" @@ -3060,17 +3067,10 @@ dependencies: react-i18next "*" -"@types/react-is@^18.2.1": - version "18.2.1" - resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-18.2.1.tgz#61d01c2a6fc089a53520c0b66996d458fdc46863" - integrity sha512-wyUkmaaSZEzFZivD8F2ftSyAfk6L+DfFliVj/mYdOXbVjRcS87fQJLTnhk6dRZPuJjI+9g6RZJO4PNCngUrmyw== - dependencies: - "@types/react" "*" - -"@types/react-transition-group@^4.4.6": - version "4.4.6" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.6.tgz#18187bcda5281f8e10dfc48f0943e2fdf4f75e2e" - integrity sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew== +"@types/react-transition-group@^4.4.6", "@types/react-transition-group@^4.4.7": + version "4.4.7" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.7.tgz#bf69f269d74aa78b99097673ca6dd6824a68ef1c" + integrity sha512-ICCyBl5mvyqYp8Qeq9B5G/fyBSRC0zx3XM3sCC6KkcMsNeAHqXBKkmat4GqdJET5jtYUpZXrxI5flve5qhi2Eg== dependencies: "@types/react" "*"