Fix global responseHandler being used in fetchBaseQuery

reduxjs · Jan 30, 2023 · 184fedd · 184fedd
1 parent 034b086
commit 184fedd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/toolkit/src/query/fetchBaseQuery.ts b/packages/toolkit/src/query/fetchBaseQuery.ts
@@ -197,6 +197,7 @@ export function fetchBaseQuery({
   jsonContentType = 'application/json',
   jsonReplacer,
   timeout: defaultTimeout,
+  responseHandler: globalResponseHandler,
   validateStatus: globalValidateStatus,
   ...baseFetchOptions
 }: FetchBaseQueryArgs = {}): BaseQueryFn<
@@ -218,7 +219,7 @@ export function fetchBaseQuery({
       url,
       headers = new Headers(baseFetchOptions.headers),
       params = undefined,
-      responseHandler = 'json' as const,
+      responseHandler = globalResponseHandler ?? ('json' as const),
       validateStatus = globalValidateStatus ?? defaultValidateStatus,
       timeout = defaultTimeout,
       ...rest

diff --git a/packages/toolkit/src/query/tests/fetchBaseQuery.test.tsx b/packages/toolkit/src/query/tests/fetchBaseQuery.test.tsx
@@ -925,7 +925,7 @@ describe('fetchBaseQuery', () => {
       })
 
       const req = globalizedBaseQuery(
-        { url: '/success', responseHandler: 'text' },
+        { url: '/success' },
         commonBaseQueryApi,
         {}
       )
@@ -934,6 +934,7 @@ describe('fetchBaseQuery', () => {
       expect(res).toBeInstanceOf(Object)
       expect(res.meta?.request).toBeInstanceOf(Request)
       expect(res.meta?.response).toBeInstanceOf(Object)
+      expect(res.error).toBeUndefined()
       expect(res.data).toEqual(`this is not json!`)
     })