Skip to content

test({react,preact}-query/usePrefetchQuery): inline the shared 'Suspended' component into each test #11077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sukvvon merged 1 commit into from
Jul 18, 2026
+120 −51
Merged

test({react,preact}-query/usePrefetchQuery): inline the shared 'Suspended' component into each test #11077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 60 additions & 25 deletions packages/preact-query/src/__tests__/usePrefetchQuery.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
useQueryErrorResetBoundary,
useSuspenseQuery,
} from '..'
import type { UseSuspenseQueryOptions } from '..'
import { ErrorBoundary } from './ErrorBoundary'
import { renderWithClient } from './utils'

Expand All @@ -35,20 +34,6 @@ describe('usePrefetchQuery', () => {
vi.useRealTimers()
})

function Suspended<TData = unknown>(props: {
queryOpts: UseSuspenseQueryOptions<TData, Error, TData, Array<string>>
children?: VNode
}) {
const state = useSuspenseQuery(props.queryOpts)

return (
<div>
<div>data: {String(state.data)}</div>
{props.children}
</div>
)
}

it('should prefetch query if query state does not exist', async () => {
const queryOpts = {
queryKey: queryKey(),
Expand All @@ -60,12 +45,17 @@ describe('usePrefetchQuery', () => {
queryFn: generateQueryFn('useSuspenseQuery'),
}

function Page() {
const state = useSuspenseQuery(componentQueryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
usePrefetchQuery(queryOpts)

return (
<Suspense fallback="Loading...">
<Suspended queryOpts={componentQueryOpts} />
<Page />
</Suspense>
)
}
Expand All @@ -85,12 +75,17 @@ describe('usePrefetchQuery', () => {
queryFn: generateQueryFn('The usePrefetchQuery hook is smart!'),
}

function Page() {
const state = useSuspenseQuery(queryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
usePrefetchQuery(queryOpts)

return (
<Suspense fallback="Loading...">
<Suspended queryOpts={queryOpts} />
<Page />
</Suspense>
)
}
Expand Down Expand Up @@ -123,13 +118,18 @@ describe('usePrefetchQuery', () => {
throw new Error('Oops! Server error!')
})

function Page() {
const state = useSuspenseQuery(queryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
usePrefetchQuery(queryOpts)

return (
<ErrorBoundary fallbackRender={() => <div>Oops!</div>}>
<Suspense fallback="Loading...">
<Suspended queryOpts={queryOpts} />
<Page />
</Suspense>
</ErrorBoundary>
)
Expand Down Expand Up @@ -160,11 +160,16 @@ describe('usePrefetchQuery', () => {
return <>{children}</>
}

function Page() {
const state = useSuspenseQuery(queryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
return (
<Suspense fallback={<></>}>
<Prefetch>
<Suspended queryOpts={queryOpts} />
<Page />
</Prefetch>
</Suspense>
)
Expand Down Expand Up @@ -192,6 +197,11 @@ describe('usePrefetchQuery', () => {
throw new Error('Oops! Server error!')
})

function Page() {
const state = useSuspenseQuery(queryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
const { reset } = useQueryErrorResetBoundary()
usePrefetchQuery(queryOpts)
Expand All @@ -207,7 +217,7 @@ describe('usePrefetchQuery', () => {
)}
>
<Suspense fallback="Loading...">
<Suspended queryOpts={queryOpts} />
<Page />
</Suspense>
</ErrorBoundary>
)
Expand Down Expand Up @@ -247,18 +257,43 @@ describe('usePrefetchQuery', () => {

const Fallback = vi.fn().mockImplementation(() => <div>Loading...</div>)

function FirstQuery({ children }: { children?: VNode }) {
const state = useSuspenseQuery(firstQueryOpts)
return (
<div>
<div>data: {String(state.data)}</div>
{children}
</div>
)
}

function SecondQuery({ children }: { children?: VNode }) {
const state = useSuspenseQuery(secondQueryOpts)
return (
<div>
<div>data: {String(state.data)}</div>
{children}
</div>
)
}

function ThirdQuery() {
const state = useSuspenseQuery(thirdQueryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
usePrefetchQuery(firstQueryOpts)
usePrefetchQuery(secondQueryOpts)
usePrefetchQuery(thirdQueryOpts)

return (
<Suspense fallback={<Fallback />}>
<Suspended queryOpts={firstQueryOpts}>
<Suspended queryOpts={secondQueryOpts}>
<Suspended queryOpts={thirdQueryOpts} />
</Suspended>
</Suspended>
<FirstQuery>
<SecondQuery>
<ThirdQuery />
</SecondQuery>
</FirstQuery>
</Suspense>
)
}
Expand Down
86 changes: 60 additions & 26 deletions packages/react-query/src/__tests__/usePrefetchQuery.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import {
} from '..'
import { renderWithClient } from './utils'

import type { UseSuspenseQueryOptions } from '..'

const generateQueryFn = (data: string) =>
vi
.fn<(...args: Array<any>) => Promise<string>>()
Expand All @@ -34,20 +32,6 @@ describe('usePrefetchQuery', () => {
vi.useRealTimers()
})

function Suspended<TData = unknown>(props: {
queryOpts: UseSuspenseQueryOptions<TData, Error, TData, Array<string>>
children?: React.ReactNode
}) {
const state = useSuspenseQuery(props.queryOpts)

return (
<div>
<div>data: {String(state.data)}</div>
{props.children}
</div>
)
}

it('should prefetch query if query state does not exist', async () => {
const queryOpts = {
queryKey: queryKey(),
Expand All @@ -59,12 +43,17 @@ describe('usePrefetchQuery', () => {
queryFn: generateQueryFn('useSuspenseQuery'),
}

function Page() {
const state = useSuspenseQuery(componentQueryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
usePrefetchQuery(queryOpts)

return (
<React.Suspense fallback="Loading...">
<Suspended queryOpts={componentQueryOpts} />
<Page />
</React.Suspense>
)
}
Expand All @@ -84,12 +73,17 @@ describe('usePrefetchQuery', () => {
queryFn: generateQueryFn('The usePrefetchQuery hook is smart!'),
}

function Page() {
const state = useSuspenseQuery(queryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
usePrefetchQuery(queryOpts)

return (
<React.Suspense fallback="Loading...">
<Suspended queryOpts={queryOpts} />
<Page />
</React.Suspense>
)
}
Expand Down Expand Up @@ -122,13 +116,18 @@ describe('usePrefetchQuery', () => {
throw new Error('Oops! Server error!')
})

function Page() {
const state = useSuspenseQuery(queryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
usePrefetchQuery(queryOpts)

return (
<ErrorBoundary fallbackRender={() => <div>Oops!</div>}>
<React.Suspense fallback="Loading...">
<Suspended queryOpts={queryOpts} />
<Page />
</React.Suspense>
</ErrorBoundary>
)
Expand Down Expand Up @@ -159,11 +158,16 @@ describe('usePrefetchQuery', () => {
return <>{children}</>
}

function Page() {
const state = useSuspenseQuery(queryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
return (
<React.Suspense>
<Prefetch>
<Suspended queryOpts={queryOpts} />
<Page />
</Prefetch>
</React.Suspense>
)
Expand Down Expand Up @@ -191,6 +195,11 @@ describe('usePrefetchQuery', () => {
throw new Error('Oops! Server error!')
})

function Page() {
const state = useSuspenseQuery(queryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
const { reset } = useQueryErrorResetBoundary()
usePrefetchQuery(queryOpts)
Expand All @@ -206,7 +215,7 @@ describe('usePrefetchQuery', () => {
)}
>
<React.Suspense fallback="Loading...">
<Suspended queryOpts={queryOpts} />
<Page />
</React.Suspense>
</ErrorBoundary>
)
Expand Down Expand Up @@ -246,18 +255,43 @@ describe('usePrefetchQuery', () => {

const Fallback = vi.fn().mockImplementation(() => <div>Loading...</div>)

function FirstQuery({ children }: { children?: React.ReactNode }) {
const state = useSuspenseQuery(firstQueryOpts)
return (
<div>
<div>data: {String(state.data)}</div>
{children}
</div>
)
}

function SecondQuery({ children }: { children?: React.ReactNode }) {
const state = useSuspenseQuery(secondQueryOpts)
return (
<div>
<div>data: {String(state.data)}</div>
{children}
</div>
)
}

function ThirdQuery() {
const state = useSuspenseQuery(thirdQueryOpts)
return <div>data: {String(state.data)}</div>
}

function App() {
usePrefetchQuery(firstQueryOpts)
usePrefetchQuery(secondQueryOpts)
usePrefetchQuery(thirdQueryOpts)

return (
<React.Suspense fallback={<Fallback />}>
<Suspended queryOpts={firstQueryOpts}>
<Suspended queryOpts={secondQueryOpts}>
<Suspended queryOpts={thirdQueryOpts} />
</Suspended>
</Suspended>
<FirstQuery>
<SecondQuery>
<ThirdQuery />
</SecondQuery>
</FirstQuery>
</React.Suspense>
)
}
Expand Down
Loading