Fix issues related to hasBodyAndHeaders usage

aryaemami59 · aryaemami59 · commit b6579714197e · 2025-05-07T20:39:48.000-05:00
diff --git a/packages/toolkit/src/query/tests/fetchBaseQuery.test.tsx b/packages/toolkit/src/query/tests/fetchBaseQuery.test.tsx
@@ -6,7 +6,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'
 
@@ -509,8 +513,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)) {
@@ -529,8 +533,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)) {
@@ -549,8 +553,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)) {
@@ -569,8 +573,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)) {
@@ -589,8 +593,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)) {
@@ -636,8 +640,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)) {
@@ -718,8 +722,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)) {
@@ -738,8 +742,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)) {
@@ -765,8 +769,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)) {
@@ -789,8 +793,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)) {
@@ -817,8 +821,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)) {
@@ -845,8 +849,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)) {
@@ -872,8 +876,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)) {
@@ -1032,8 +1036,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)) {
@@ -1050,8 +1054,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)) {
@@ -1072,8 +1076,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)) {
@@ -1095,8 +1099,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()
@@ -1217,8 +1221,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
`@@ -6,7 +6,11 @@ import { HttpResponse, delay, http } from 'msw'`
`6`	`6`	`import nodeFetch from 'node-fetch'`
`7`	`7`	`import queryString from 'query-string'`
`8`	`8`	`import { vi } from 'vitest'`
`9`		`-import { hasBodyAndHeaders, setupApiStore } from '../../tests/utils/helpers'`
	`9`	`+import {`
	`10`	`+ hasBodyAndHeaders,`
	`11`	`+ isObject,`
	`12`	`+ setupApiStore,`
	`13`	`+} from '../../tests/utils/helpers'`
`10`	`14`	`import type { BaseQueryApi } from '../baseQueryTypes'`
`11`	`15`	`import { server } from './mocks/server'`
`12`	`16`
`@@ -509,8 +513,8 @@ describe('fetchBaseQuery', () => {`
`509`	`513`	`{},`
`510`	`514`	`)`
`511`	`515`
`512`		`- if (!hasBodyAndHeaders(request)) {`
`513`		`- expect.fail('Expected request to have body and headers')`
	`516`	`+ if (!isObject(request)) {`
	`517`	`+ expect.fail('Expected request to be an object')`
`514`	`518`	`}`
`515`	`519`
`516`	`520`	`if (!('url' in request)) {`
`@@ -529,8 +533,8 @@ describe('fetchBaseQuery', () => {`
`529`	`533`	`{},`
`530`	`534`	`)`
`531`	`535`
`532`		`- if (!hasBodyAndHeaders(request)) {`
`533`		`- expect.fail('Expected request to have body and headers')`
	`536`	`+ if (!isObject(request)) {`
	`537`	`+ expect.fail('Expected request to be an object')`
`534`	`538`	`}`
`535`	`539`
`536`	`540`	`if (!('url' in request)) {`
`@@ -549,8 +553,8 @@ describe('fetchBaseQuery', () => {`
`549`	`553`	`{},`
`550`	`554`	`)`
`551`	`555`
`552`		`- if (!hasBodyAndHeaders(request)) {`
`553`		`- expect.fail('Expected request to have body and headers')`
	`556`	`+ if (!isObject(request)) {`
	`557`	`+ expect.fail('Expected request to be an object')`
`554`	`558`	`}`
`555`	`559`
`556`	`560`	`if (!('url' in request)) {`
`@@ -569,8 +573,8 @@ describe('fetchBaseQuery', () => {`
`569`	`573`	`{},`
`570`	`574`	`)`
`571`	`575`
`572`		`- if (!hasBodyAndHeaders(request)) {`
`573`		`- expect.fail('Expected request to have body and headers')`
	`576`	`+ if (!isObject(request)) {`
	`577`	`+ expect.fail('Expected request to be an object')`
`574`	`578`	`}`
`575`	`579`
`576`	`580`	`if (!('url' in request)) {`
`@@ -589,8 +593,8 @@ describe('fetchBaseQuery', () => {`
`589`	`593`	`{},`
`590`	`594`	`)`
`591`	`595`
`592`		`- if (!hasBodyAndHeaders(request)) {`
`593`		`- expect.fail('Expected request to have body and headers')`
	`596`	`+ if (!isObject(request)) {`
	`597`	`+ expect.fail('Expected request to be an object')`
`594`	`598`	`}`
`595`	`599`
`596`	`600`	`if (!('url' in request)) {`
`@@ -636,8 +640,8 @@ describe('fetchBaseQuery', () => {`
`636`	`640`	`{},`
`637`	`641`	`)`
`638`	`642`
`639`		`- if (!hasBodyAndHeaders(request)) {`
`640`		`- expect.fail('Expected request to have body and headers')`
	`643`	`+ if (!isObject(request)) {`
	`644`	`+ expect.fail('Expected request to be an object')`
`641`	`645`	`}`
`642`	`646`
`643`	`647`	`if (!('url' in request)) {`
`@@ -718,8 +722,8 @@ describe('fetchBaseQuery', () => {`
`718`	`722`	`{},`
`719`	`723`	`)`
`720`	`724`
`721`		`- if (!hasBodyAndHeaders(request)) {`
`722`		`- expect.fail('Expected request to have body and headers')`
	`725`	`+ if (!isObject(request)) {`
	`726`	`+ expect.fail('Expected request to be an object')`
`723`	`727`	`}`
`724`	`728`
`725`	`729`	`if (!('url' in request)) {`
`@@ -738,8 +742,8 @@ describe('fetchBaseQuery', () => {`
`738`	`742`	`{},`
`739`	`743`	`)`
`740`	`744`
`741`		`- if (!hasBodyAndHeaders(request)) {`
`742`		`- expect.fail('Expected request to have body and headers')`
	`745`	`+ if (!isObject(request)) {`
	`746`	`+ expect.fail('Expected request to be an object')`
`743`	`747`	`}`
`744`	`748`
`745`	`749`	`if (!('url' in request)) {`
`@@ -765,8 +769,8 @@ describe('fetchBaseQuery', () => {`
`765`	`769`	`{},`
`766`	`770`	`)`
`767`	`771`
`768`		`- if (!hasBodyAndHeaders(request)) {`
`769`		`- expect.fail('Expected request to have body and headers')`
	`772`	`+ if (!isObject(request)) {`
	`773`	`+ expect.fail('Expected request to be an object')`
`770`	`774`	`}`
`771`	`775`
`772`	`776`	`if (!('url' in request)) {`
`@@ -789,8 +793,8 @@ describe('fetchBaseQuery', () => {`
`789`	`793`	`{},`
`790`	`794`	`)`
`791`	`795`
`792`		`- if (!hasBodyAndHeaders(request)) {`
`793`		`- expect.fail('Expected request to have body and headers')`
	`796`	`+ if (!isObject(request)) {`
	`797`	`+ expect.fail('Expected request to be an object')`
`794`	`798`	`}`
`795`	`799`
`796`	`800`	`if (!('url' in request)) {`
`@@ -817,8 +821,8 @@ describe('fetchBaseQuery', () => {`
`817`	`821`
`818`	`822`	`const { data: request } = await doRequest()`
`819`	`823`
`820`		`- if (!hasBodyAndHeaders(request)) {`
`821`		`- expect.fail('Expected request to have body and headers')`
	`824`	`+ if (!isObject(request)) {`
	`825`	`+ expect.fail('Expected request to be an object')`
`822`	`826`	`}`
`823`	`827`
`824`	`828`	`if (!('url' in request)) {`
`@@ -845,8 +849,8 @@ describe('fetchBaseQuery', () => {`
`845`	`849`
`846`	`850`	`const { data: request } = await doRequest()`
`847`	`851`
`848`		`- if (!hasBodyAndHeaders(request)) {`
`849`		`- expect.fail('Expected request to have body and headers')`
	`852`	`+ if (!isObject(request)) {`
	`853`	`+ expect.fail('Expected request to be an object')`
`850`	`854`	`}`
`851`	`855`
`852`	`856`	`if (!('url' in request)) {`
`@@ -872,8 +876,8 @@ describe('fetchBaseQuery', () => {`
`872`	`876`
`873`	`877`	`const { data: request } = await doRequest()`
`874`	`878`
`875`		`- if (!hasBodyAndHeaders(request)) {`
`876`		`- expect.fail('Expected request to have body and headers')`
	`879`	`+ if (!isObject(request)) {`
	`880`	`+ expect.fail('Expected request to be an object')`
`877`	`881`	`}`
`878`	`882`
`879`	`883`	`if (!('url' in request)) {`
`@@ -1032,8 +1036,8 @@ describe('fetchBaseQuery', () => {`
`1032`	`1036`
`1033`	`1037`	`const { data: request } = await doRequest()`
`1034`	`1038`
`1035`		`- if (!hasBodyAndHeaders(request)) {`
`1036`		`- expect.fail('Expected request to have body and headers')`
	`1039`	`+ if (!isObject(request)) {`
	`1040`	`+ expect.fail('Expected request to be an object')`
`1037`	`1041`	`}`
`1038`	`1042`
`1039`	`1043`	`if (!('url' in request)) {`
`@@ -1050,8 +1054,8 @@ describe('fetchBaseQuery', () => {`
`1050`	`1054`	`{},`
`1051`	`1055`	`)`
`1052`	`1056`
`1053`		`- if (!hasBodyAndHeaders(request)) {`
`1054`		`- expect.fail('Expected request to have body and headers')`
	`1057`	`+ if (!isObject(request)) {`
	`1058`	`+ expect.fail('Expected request to be an object')`
`1055`	`1059`	`}`
`1056`	`1060`
`1057`	`1061`	`if (!('url' in request)) {`
`@@ -1072,8 +1076,8 @@ describe('fetchBaseQuery', () => {`
`1072`	`1076`	`{},`
`1073`	`1077`	`)`
`1074`	`1078`
`1075`		`- if (!hasBodyAndHeaders(request)) {`
`1076`		`- expect.fail('Expected request to have body and headers')`
	`1079`	`+ if (!isObject(request)) {`
	`1080`	`+ expect.fail('Expected request to be an object')`
`1077`	`1081`	`}`
`1078`	`1082`
`1079`	`1083`	`if (!('url' in request)) {`
`@@ -1095,8 +1099,8 @@ describe('fetchBaseQuery', () => {`
`1095`	`1099`	`{},`
`1096`	`1100`	`)`
`1097`	`1101`
`1098`		`- if (!hasBodyAndHeaders(request)) {`
`1099`		`- expect.fail('Expected request to have body and headers')`
	`1102`	`+ if (!isObject(request)) {`
	`1103`	`+ expect.fail('Expected request to be an object')`
`1100`	`1104`	`}`
`1101`	`1105`
`1102`	`1106`	`expect(request.headers['banana']).toBeUndefined()`
`@@ -1217,8 +1221,8 @@ describe('fetchFn', () => {`
`1217`	`1221`	`{},`
`1218`	`1222`	`)`
`1219`	`1223`
`1220`		`- if (!hasBodyAndHeaders(request)) {`
`1221`		`- expect.fail('Expected request to have body and headers')`
	`1224`	`+ if (!isObject(request)) {`
	`1225`	`+ expect.fail('Expected request to be an object')`
`1222`	`1226`	`}`
`1223`	`1227`
`1224`	`1228`	`if (!('url' in request)) {`