Skip to content

Commit 96b154a

Browse files
committed
test suite passes onto real on-site testing
1 parent 61fc08d commit 96b154a

File tree

8 files changed

+177
-180
lines changed

8 files changed

+177
-180
lines changed

src/QueryProvider.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@ import { type ReactNode } from 'react'
22
import { QueryClientProvider } from '@tanstack/react-query'
33
import { ReactQueryDevtools } from '@tanstack/react-query-devtools'
44

5-
import { queryClient } from '~/plugins/queryClient'
5+
import { queryClient, testQueryClient } from '~/plugins/queryClient'
66

77
type QueryProviderProps = {
88
children: ReactNode
9+
testMode?: boolean
910
}
1011

11-
const QueryProvider: React.FC<QueryProviderProps> = ({ children }) => {
12+
const QueryProvider: React.FC<QueryProviderProps> = ({
13+
children,
14+
testMode = false
15+
}) => {
1216
return (
13-
<QueryClientProvider client={queryClient}>
17+
<QueryClientProvider client={testMode ? testQueryClient : queryClient}>
1418
<ReactQueryDevtools />
1519
{children}
1620
</QueryClientProvider>

src/containers/my-cooperations/accept-cooperation-modal/AcceptCooperationModal.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import {
2828
import { snackbarVariants } from '~/constants'
2929
import { styles } from '~/containers/my-cooperations/accept-cooperation-modal/AcceptCooperation.styles'
3030
import useSnackbarAlert from '~/hooks/use-snackbar-alert'
31+
import { useAppSelector } from '~/hooks/use-redux'
3132

3233
interface AcceptCooperationModalProps {
3334
cooperation: Cooperation
@@ -42,8 +43,9 @@ const AcceptCooperationModal: React.FC<AcceptCooperationModalProps> = ({
4243
const { checkConfirmation } = useConfirm()
4344
const { handleAlert, handleErrorAlert } = useSnackbarAlert()
4445
const [minPrice, maxPrice] = minMaxPrice(cooperation.price, 0.25)
46+
const { userRole } = useAppSelector((state) => state.appMain)
4547

46-
const needAction = cooperation.user.role !== cooperation.needAction
48+
const needAction = userRole !== cooperation.needAction.role
4749

4850
const handleUpdateCooperation = (
4951
params?: Omit<UpdateCooperationsParams, '_id'>

src/containers/my-cooperations/cooperation-details/CooperationDetails.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@ const CooperationDetails = () => {
8282
isError
8383
} = useQuery({
8484
queryFn: getCooperation,
85-
queryKey: ['cooperation', id],
86-
options: {
87-
staleTime: Infinity
88-
}
85+
queryKey: ['cooperation', id]
8986
})
9087

9188
useEffect(() => {

src/pages/bookmarked-offers/BookmarkedOffers.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@ const BookmarkedOffers = () => {
6565
isError
6666
} = useQuery({
6767
queryKey: ['bookmarks', filters, searchParams.toString()],
68-
queryFn: getBookmarkedOffers,
69-
options: {
70-
staleTime: Infinity
71-
}
68+
queryFn: getBookmarkedOffers
7269
})
7370

7471
useEffect(() => {

src/plugins/queryClient.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
import { QueryClient } from '@tanstack/react-query'
22

33
export const queryClient = new QueryClient()
4+
export const testQueryClient = new QueryClient({
5+
defaultOptions: {
6+
queries: {
7+
retry: false,
8+
refetchOnWindowFocus: false,
9+
refetchOnReconnect: false,
10+
staleTime: 0
11+
}
12+
}
13+
})

tests/test-utils.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const renderWithProviders = (
4040
<MemoryRouter initialEntries={[initialEntries]}>
4141
<StyledEngineProvider injectFirst>
4242
<ThemeProvider theme={theme}>
43-
<QueryProvider>
43+
<QueryProvider testMode>
4444
<PopupsProvider>{children}</PopupsProvider>
4545
</QueryProvider>
4646
</ThemeProvider>

0 commit comments

Comments
 (0)