From a8c119dc6991a4acfec65af401c0fdb9f0b3f0eb Mon Sep 17 00:00:00 2001 From: Harsh Date: Wed, 5 Feb 2025 00:33:16 +0530 Subject: [PATCH 1/3] Upgraded React-Toastify from 10.0.6 to 11.0.3 --- package-lock.json | 14 +++++++------- package.json | 2 +- .../EventRegistrantsModal/AddOnSpotAttendee.tsx | 1 - src/components/OrgListCard/OrgListCard.spec.tsx | 3 +-- src/index.tsx | 1 - 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index d3d9675906..7c2b603b03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,7 +60,7 @@ "react-multi-carousel": "^2.8.5", "react-redux": "^9.1.2", "react-router-dom": "^6.27.0", - "react-toastify": "^10.0.6", + "react-toastify": "^11.0.3", "react-tooltip": "^5.28.0", "redux": "^5.0.1", "redux-thunk": "^3.1.0", @@ -19183,16 +19183,16 @@ } }, "node_modules/react-toastify": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-10.0.6.tgz", - "integrity": "sha512-yYjp+omCDf9lhZcrZHKbSq7YMuK0zcYkDFTzfRFgTXkTFHZ1ToxwAonzA4JI5CxA91JpjFLmwEsZEgfYfOqI1A==", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-11.0.3.tgz", + "integrity": "sha512-cbPtHJPfc0sGqVwozBwaTrTu1ogB9+BLLjd4dDXd863qYLj7DGrQ2sg5RAChjFUB4yc3w8iXOtWcJqPK/6xqRQ==", "license": "MIT", "dependencies": { - "clsx": "^2.1.0" + "clsx": "^2.1.1" }, "peerDependencies": { - "react": ">=18", - "react-dom": ">=18" + "react": "^18 || ^19", + "react-dom": "^18 || ^19" } }, "node_modules/react-tooltip": { diff --git a/package.json b/package.json index f0e24753b5..e6f97eecce 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "react-multi-carousel": "^2.8.5", "react-redux": "^9.1.2", "react-router-dom": "^6.27.0", - "react-toastify": "^10.0.6", + "react-toastify": "^11.0.3", "react-tooltip": "^5.28.0", "redux": "^5.0.1", "redux-thunk": "^3.1.0", diff --git a/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx b/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx index 6de839ce04..593d7dd061 100644 --- a/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx +++ b/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx @@ -4,7 +4,6 @@ import { Modal, Form, Button, Spinner } from 'react-bootstrap'; import { useParams } from 'react-router-dom'; import { useMutation } from '@apollo/client'; import { toast } from 'react-toastify'; -import 'react-toastify/dist/ReactToastify.css'; import type { InterfaceAddOnSpotAttendeeProps, InterfaceFormData, diff --git a/src/components/OrgListCard/OrgListCard.spec.tsx b/src/components/OrgListCard/OrgListCard.spec.tsx index a7b021a209..b1f8b4ea1f 100644 --- a/src/components/OrgListCard/OrgListCard.spec.tsx +++ b/src/components/OrgListCard/OrgListCard.spec.tsx @@ -1,6 +1,5 @@ import React from 'react'; -import { act } from 'react-dom/test-utils'; -import { render, screen } from '@testing-library/react'; +import { render, screen, act } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { describe, test, expect, vi, beforeEach } from 'vitest'; import { I18nextProvider } from 'react-i18next'; diff --git a/src/index.tsx b/src/index.tsx index b13eabb9d5..02f5ca3bac 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -19,7 +19,6 @@ import 'react-datepicker/dist/react-datepicker.css'; // React Datepicker Styles import 'flag-icons/css/flag-icons.min.css'; // Flag Icons Styles import { Provider } from 'react-redux'; import { ToastContainer, toast } from 'react-toastify'; -import 'react-toastify/dist/ReactToastify.css'; import { LocalizationProvider } from '@mui/x-date-pickers'; import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'; From cd20eb19cdff52a3c05e8dcfcbe15c916464d0e8 Mon Sep 17 00:00:00 2001 From: Harsh Date: Wed, 5 Feb 2025 10:41:18 +0530 Subject: [PATCH 2/3] Removed coverage ignore statement --- src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx b/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx index 593d7dd061..87060960b0 100644 --- a/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx +++ b/src/components/EventRegistrantsModal/AddOnSpotAttendee.tsx @@ -94,7 +94,6 @@ const AddOnSpotAttendee: React.FC = ({ handleClose(); } } catch (error) { - /* istanbul ignore next */ errorHandler(t, error as Error); } finally { setIsSubmitting(false); From 0b12dc4d86cf79511d4aebad7462d101913cf456 Mon Sep 17 00:00:00 2001 From: Harsh Date: Wed, 5 Feb 2025 12:08:55 +0530 Subject: [PATCH 3/3] fix: wrap wait with async act for proper test handling --- src/components/OrgListCard/OrgListCard.spec.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/OrgListCard/OrgListCard.spec.tsx b/src/components/OrgListCard/OrgListCard.spec.tsx index b1f8b4ea1f..93f6878560 100644 --- a/src/components/OrgListCard/OrgListCard.spec.tsx +++ b/src/components/OrgListCard/OrgListCard.spec.tsx @@ -41,8 +41,8 @@ const MOCKS = [ const link = new StaticMockLink(MOCKS, true); async function wait(ms = 100): Promise { - await act(() => { - return new Promise((resolve) => { + await act(async () => { + await new Promise((resolve) => { setTimeout(resolve, ms); }); });