Fix issues related to hasBodyAndHeaders usage

aryaemami59 · aryaemami59 · commit a93bc7d1ae98 · 2025-10-22T04:34:17.000-05:00
diff --git a/packages/toolkit/src/query/tests/fetchBaseQuery.test.tsx b/packages/toolkit/src/query/tests/fetchBaseQuery.test.tsx
@@ -7,7 +7,11 @@ import { HttpResponse, delay, http } from 'msw'
 import nodeFetch from 'node-fetch'
 import queryString from 'query-string'
 import { vi } from 'vitest'
-import { hasBodyAndHeaders, setupApiStore } from '../../tests/utils/helpers'
+import {
+  hasBodyAndHeaders,
+  isObject,
+  setupApiStore,
+} from '../../tests/utils/helpers'
 import type { BaseQueryApi } from '../baseQueryTypes'
 import { server } from './mocks/server'
 
@@ -510,8 +514,8 @@ describe('fetchBaseQuery', () => {
         {},
       )
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -530,8 +534,8 @@ describe('fetchBaseQuery', () => {
         {},
       )
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -550,8 +554,8 @@ describe('fetchBaseQuery', () => {
         {},
       )
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -570,8 +574,8 @@ describe('fetchBaseQuery', () => {
         {},
       )
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -590,8 +594,8 @@ describe('fetchBaseQuery', () => {
         {},
       )
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -637,8 +641,8 @@ describe('fetchBaseQuery', () => {
         {},
       )
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -719,8 +723,8 @@ describe('fetchBaseQuery', () => {
         {},
       )
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -739,8 +743,8 @@ describe('fetchBaseQuery', () => {
         {},
       )
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -766,8 +770,8 @@ describe('fetchBaseQuery', () => {
         {},
       )
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -790,8 +794,8 @@ describe('fetchBaseQuery', () => {
         {},
       )
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -818,8 +822,8 @@ describe('fetchBaseQuery', () => {
 
       const { data: request } = await doRequest()
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -846,8 +850,8 @@ describe('fetchBaseQuery', () => {
 
       const { data: request } = await doRequest()
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -873,8 +877,8 @@ describe('fetchBaseQuery', () => {
 
       const { data: request } = await doRequest()
 
-      if (!hasBodyAndHeaders(request)) {
-        expect.fail('Expected request to have body and headers')
+      if (!isObject(request)) {
+        expect.fail('Expected request to be an object')
       }
 
       if (!('url' in request)) {
@@ -1033,8 +1037,8 @@ describe('fetchBaseQuery', () => {
 
     const { data: request } = await doRequest()
 
-    if (!hasBodyAndHeaders(request)) {
-      expect.fail('Expected request to have body and headers')
+    if (!isObject(request)) {
+      expect.fail('Expected request to be an object')
     }
 
     if (!('url' in request)) {
@@ -1051,8 +1055,8 @@ describe('fetchBaseQuery', () => {
       {},
     )
 
-    if (!hasBodyAndHeaders(request)) {
-      expect.fail('Expected request to have body and headers')
+    if (!isObject(request)) {
+      expect.fail('Expected request to be an object')
     }
 
     if (!('url' in request)) {
@@ -1073,8 +1077,8 @@ describe('fetchBaseQuery', () => {
       {},
     )
 
-    if (!hasBodyAndHeaders(request)) {
-      expect.fail('Expected request to have body and headers')
+    if (!isObject(request)) {
+      expect.fail('Expected request to be an object')
     }
 
     if (!('url' in request)) {
@@ -1096,8 +1100,8 @@ describe('fetchBaseQuery', () => {
       {},
     )
 
-    if (!hasBodyAndHeaders(request)) {
-      expect.fail('Expected request to have body and headers')
+    if (!isObject(request)) {
+      expect.fail('Expected request to be an object')
     }
 
     expect(request.headers['banana']).toBeUndefined()
@@ -1358,8 +1362,8 @@ describe('fetchFn', () => {
       {},
     )
 
-    if (!hasBodyAndHeaders(request)) {
-      expect.fail('Expected request to have body and headers')
+    if (!isObject(request)) {
+      expect.fail('Expected request to be an object')
     }
 
     if (!('url' in request)) {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,11 @@ import { HttpResponse, delay, http } from 'msw'`
`7`	`7`	`import nodeFetch from 'node-fetch'`
`8`	`8`	`import queryString from 'query-string'`
`9`	`9`	`import { vi } from 'vitest'`
`10`		`-import { hasBodyAndHeaders, setupApiStore } from '../../tests/utils/helpers'`
	`10`	`+import {`
	`11`	`+ hasBodyAndHeaders,`
	`12`	`+ isObject,`
	`13`	`+ setupApiStore,`
	`14`	`+} from '../../tests/utils/helpers'`
`11`	`15`	`import type { BaseQueryApi } from '../baseQueryTypes'`
`12`	`16`	`import { server } from './mocks/server'`
`13`	`17`
`@@ -510,8 +514,8 @@ describe('fetchBaseQuery', () => {`
`510`	`514`	`{},`
`511`	`515`	`)`
`512`	`516`
`513`		`- if (!hasBodyAndHeaders(request)) {`
`514`		`- expect.fail('Expected request to have body and headers')`
	`517`	`+ if (!isObject(request)) {`
	`518`	`+ expect.fail('Expected request to be an object')`
`515`	`519`	`}`
`516`	`520`
`517`	`521`	`if (!('url' in request)) {`
`@@ -530,8 +534,8 @@ describe('fetchBaseQuery', () => {`
`530`	`534`	`{},`
`531`	`535`	`)`
`532`	`536`
`533`		`- if (!hasBodyAndHeaders(request)) {`
`534`		`- expect.fail('Expected request to have body and headers')`
	`537`	`+ if (!isObject(request)) {`
	`538`	`+ expect.fail('Expected request to be an object')`
`535`	`539`	`}`
`536`	`540`
`537`	`541`	`if (!('url' in request)) {`
`@@ -550,8 +554,8 @@ describe('fetchBaseQuery', () => {`
`550`	`554`	`{},`
`551`	`555`	`)`
`552`	`556`
`553`		`- if (!hasBodyAndHeaders(request)) {`
`554`		`- expect.fail('Expected request to have body and headers')`
	`557`	`+ if (!isObject(request)) {`
	`558`	`+ expect.fail('Expected request to be an object')`
`555`	`559`	`}`
`556`	`560`
`557`	`561`	`if (!('url' in request)) {`
`@@ -570,8 +574,8 @@ describe('fetchBaseQuery', () => {`
`570`	`574`	`{},`
`571`	`575`	`)`
`572`	`576`
`573`		`- if (!hasBodyAndHeaders(request)) {`
`574`		`- expect.fail('Expected request to have body and headers')`
	`577`	`+ if (!isObject(request)) {`
	`578`	`+ expect.fail('Expected request to be an object')`
`575`	`579`	`}`
`576`	`580`
`577`	`581`	`if (!('url' in request)) {`
`@@ -590,8 +594,8 @@ describe('fetchBaseQuery', () => {`
`590`	`594`	`{},`
`591`	`595`	`)`
`592`	`596`
`593`		`- if (!hasBodyAndHeaders(request)) {`
`594`		`- expect.fail('Expected request to have body and headers')`
	`597`	`+ if (!isObject(request)) {`
	`598`	`+ expect.fail('Expected request to be an object')`
`595`	`599`	`}`
`596`	`600`
`597`	`601`	`if (!('url' in request)) {`
`@@ -637,8 +641,8 @@ describe('fetchBaseQuery', () => {`
`637`	`641`	`{},`
`638`	`642`	`)`
`639`	`643`
`640`		`- if (!hasBodyAndHeaders(request)) {`
`641`		`- expect.fail('Expected request to have body and headers')`
	`644`	`+ if (!isObject(request)) {`
	`645`	`+ expect.fail('Expected request to be an object')`
`642`	`646`	`}`
`643`	`647`
`644`	`648`	`if (!('url' in request)) {`
`@@ -719,8 +723,8 @@ describe('fetchBaseQuery', () => {`
`719`	`723`	`{},`
`720`	`724`	`)`
`721`	`725`
`722`		`- if (!hasBodyAndHeaders(request)) {`
`723`		`- expect.fail('Expected request to have body and headers')`
	`726`	`+ if (!isObject(request)) {`
	`727`	`+ expect.fail('Expected request to be an object')`
`724`	`728`	`}`
`725`	`729`
`726`	`730`	`if (!('url' in request)) {`
`@@ -739,8 +743,8 @@ describe('fetchBaseQuery', () => {`
`739`	`743`	`{},`
`740`	`744`	`)`
`741`	`745`
`742`		`- if (!hasBodyAndHeaders(request)) {`
`743`		`- expect.fail('Expected request to have body and headers')`
	`746`	`+ if (!isObject(request)) {`
	`747`	`+ expect.fail('Expected request to be an object')`
`744`	`748`	`}`
`745`	`749`
`746`	`750`	`if (!('url' in request)) {`
`@@ -766,8 +770,8 @@ describe('fetchBaseQuery', () => {`
`766`	`770`	`{},`
`767`	`771`	`)`
`768`	`772`
`769`		`- if (!hasBodyAndHeaders(request)) {`
`770`		`- expect.fail('Expected request to have body and headers')`
	`773`	`+ if (!isObject(request)) {`
	`774`	`+ expect.fail('Expected request to be an object')`
`771`	`775`	`}`
`772`	`776`
`773`	`777`	`if (!('url' in request)) {`
`@@ -790,8 +794,8 @@ describe('fetchBaseQuery', () => {`
`790`	`794`	`{},`
`791`	`795`	`)`
`792`	`796`
`793`		`- if (!hasBodyAndHeaders(request)) {`
`794`		`- expect.fail('Expected request to have body and headers')`
	`797`	`+ if (!isObject(request)) {`
	`798`	`+ expect.fail('Expected request to be an object')`
`795`	`799`	`}`
`796`	`800`
`797`	`801`	`if (!('url' in request)) {`
`@@ -818,8 +822,8 @@ describe('fetchBaseQuery', () => {`
`818`	`822`
`819`	`823`	`const { data: request } = await doRequest()`
`820`	`824`
`821`		`- if (!hasBodyAndHeaders(request)) {`
`822`		`- expect.fail('Expected request to have body and headers')`
	`825`	`+ if (!isObject(request)) {`
	`826`	`+ expect.fail('Expected request to be an object')`
`823`	`827`	`}`
`824`	`828`
`825`	`829`	`if (!('url' in request)) {`
`@@ -846,8 +850,8 @@ describe('fetchBaseQuery', () => {`
`846`	`850`
`847`	`851`	`const { data: request } = await doRequest()`
`848`	`852`
`849`		`- if (!hasBodyAndHeaders(request)) {`
`850`		`- expect.fail('Expected request to have body and headers')`
	`853`	`+ if (!isObject(request)) {`
	`854`	`+ expect.fail('Expected request to be an object')`
`851`	`855`	`}`
`852`	`856`
`853`	`857`	`if (!('url' in request)) {`
`@@ -873,8 +877,8 @@ describe('fetchBaseQuery', () => {`
`873`	`877`
`874`	`878`	`const { data: request } = await doRequest()`
`875`	`879`
`876`		`- if (!hasBodyAndHeaders(request)) {`
`877`		`- expect.fail('Expected request to have body and headers')`
	`880`	`+ if (!isObject(request)) {`
	`881`	`+ expect.fail('Expected request to be an object')`
`878`	`882`	`}`
`879`	`883`
`880`	`884`	`if (!('url' in request)) {`
`@@ -1033,8 +1037,8 @@ describe('fetchBaseQuery', () => {`
`1033`	`1037`
`1034`	`1038`	`const { data: request } = await doRequest()`
`1035`	`1039`
`1036`		`- if (!hasBodyAndHeaders(request)) {`
`1037`		`- expect.fail('Expected request to have body and headers')`
	`1040`	`+ if (!isObject(request)) {`
	`1041`	`+ expect.fail('Expected request to be an object')`
`1038`	`1042`	`}`
`1039`	`1043`
`1040`	`1044`	`if (!('url' in request)) {`
`@@ -1051,8 +1055,8 @@ describe('fetchBaseQuery', () => {`
`1051`	`1055`	`{},`
`1052`	`1056`	`)`
`1053`	`1057`
`1054`		`- if (!hasBodyAndHeaders(request)) {`
`1055`		`- expect.fail('Expected request to have body and headers')`
	`1058`	`+ if (!isObject(request)) {`
	`1059`	`+ expect.fail('Expected request to be an object')`
`1056`	`1060`	`}`
`1057`	`1061`
`1058`	`1062`	`if (!('url' in request)) {`
`@@ -1073,8 +1077,8 @@ describe('fetchBaseQuery', () => {`
`1073`	`1077`	`{},`
`1074`	`1078`	`)`
`1075`	`1079`
`1076`		`- if (!hasBodyAndHeaders(request)) {`
`1077`		`- expect.fail('Expected request to have body and headers')`
	`1080`	`+ if (!isObject(request)) {`
	`1081`	`+ expect.fail('Expected request to be an object')`
`1078`	`1082`	`}`
`1079`	`1083`
`1080`	`1084`	`if (!('url' in request)) {`
`@@ -1096,8 +1100,8 @@ describe('fetchBaseQuery', () => {`
`1096`	`1100`	`{},`
`1097`	`1101`	`)`
`1098`	`1102`
`1099`		`- if (!hasBodyAndHeaders(request)) {`
`1100`		`- expect.fail('Expected request to have body and headers')`
	`1103`	`+ if (!isObject(request)) {`
	`1104`	`+ expect.fail('Expected request to be an object')`
`1101`	`1105`	`}`
`1102`	`1106`
`1103`	`1107`	`expect(request.headers['banana']).toBeUndefined()`
`@@ -1358,8 +1362,8 @@ describe('fetchFn', () => {`
`1358`	`1362`	`{},`
`1359`	`1363`	`)`
`1360`	`1364`
`1361`		`- if (!hasBodyAndHeaders(request)) {`
`1362`		`- expect.fail('Expected request to have body and headers')`
	`1365`	`+ if (!isObject(request)) {`
	`1366`	`+ expect.fail('Expected request to be an object')`
`1363`	`1367`	`}`
`1364`	`1368`
`1365`	`1369`	`if (!('url' in request)) {`