Skip to content

Commit 3418c5a

Browse files
committed
Fix OverrideResultType imports in test files
1 parent 5a43739 commit 3418c5a

File tree

3 files changed

+18
-23
lines changed

3 files changed

+18
-23
lines changed

packages/toolkit/src/query/tests/createApi.test-d.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ import type { SerializedError } from '@reduxjs/toolkit'
33
import { configureStore } from '@reduxjs/toolkit'
44
import type {
55
DefinitionsFromApi,
6-
OverrideResultType,
7-
TagTypesFromApi,
8-
} from '@reduxjs/toolkit/dist/query/endpointDefinitions'
9-
import type {
106
FetchBaseQueryError,
117
MutationDefinition,
8+
OverrideResultType,
129
QueryDefinition,
1310
TagDescription,
11+
TagTypesFromApi,
1412
} from '@reduxjs/toolkit/query'
1513
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query'
1614

packages/toolkit/src/query/tests/createApi.test.ts

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1+
import { server } from '@internal/query/tests/mocks/server'
2+
import {
3+
getSerializedHeaders,
4+
setupApiStore,
5+
} from '@internal/tests/utils/helpers'
16
import { configureStore, createAction, createReducer } from '@reduxjs/toolkit'
27
import type {
8+
DefinitionsFromApi,
39
FetchBaseQueryMeta,
10+
OverrideResultType,
411
SerializeQueryArgs,
12+
TagTypesFromApi,
513
} from '@reduxjs/toolkit/query'
614
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query'
7-
import type { MockInstance } from 'vitest'
8-
9-
import type {
10-
DefinitionsFromApi,
11-
OverrideResultType,
12-
TagTypesFromApi,
13-
} from '@reduxjs/toolkit/dist/query/endpointDefinitions'
14-
import { server } from '@internal/query/tests/mocks/server'
15-
import {
16-
getSerializedHeaders,
17-
setupApiStore,
18-
} from '@internal/tests/utils/helpers'
1915
import { HttpResponse, delay, http } from 'msw'
2016
import nodeFetch from 'node-fetch'
17+
import type { MockInstance } from 'vitest'
2118

2219
beforeAll(() => {
2320
vi.stubEnv('NODE_ENV', 'development')

packages/toolkit/src/query/tests/invalidation.test.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { TagDescription } from '@reduxjs/toolkit/dist/query/endpointDefinitions'
1+
import type { TagDescription } from '@reduxjs/toolkit/query'
22
import { createApi, fakeBaseQuery } from '@reduxjs/toolkit/query'
33
import { waitFor } from '@testing-library/react'
44
import { delay } from 'msw'
@@ -13,7 +13,7 @@ const tagTypes = [
1313
'dog',
1414
'giraffe',
1515
] as const
16-
type TagTypes = typeof tagTypes[number]
16+
type TagTypes = (typeof tagTypes)[number]
1717
type Tags = TagDescription<TagTypes>[]
1818

1919
/** providesTags, invalidatesTags, shouldInvalidate */
@@ -103,23 +103,23 @@ test.each(caseMatrix)(
103103
}),
104104
}),
105105
undefined,
106-
{ withoutTestLifecycles: true }
106+
{ withoutTestLifecycles: true },
107107
)
108108

109109
store.dispatch(providing.initiate())
110110
store.dispatch(unrelated.initiate())
111111
expect(queryCount).toBe(1)
112112
await waitFor(() => {
113113
expect(api.endpoints.providing.select()(store.getState()).status).toBe(
114-
'fulfilled'
114+
'fulfilled',
115115
)
116116
expect(api.endpoints.unrelated.select()(store.getState()).status).toBe(
117-
'fulfilled'
117+
'fulfilled',
118118
)
119119
})
120120
const toInvalidate = api.util.selectInvalidatedBy(
121121
store.getState(),
122-
invalidatesTags
122+
invalidatesTags,
123123
)
124124

125125
if (shouldInvalidate) {
@@ -138,5 +138,5 @@ test.each(caseMatrix)(
138138
expect(queryCount).toBe(1)
139139
await delay(2)
140140
expect(queryCount).toBe(shouldInvalidate ? 2 : 1)
141-
}
141+
},
142142
)

0 commit comments

Comments
 (0)