Fix issues related to hasBodyAndHeaders usage

aryaemami59 · aryaemami59 · commit c2b0aa627a54 · 2024-09-13T22:13:38.000-05:00
diff --git a/packages/toolkit/src/query/tests/fetchBaseQuery.test.tsx b/packages/toolkit/src/query/tests/fetchBaseQuery.test.tsx
@@ -5,7 +5,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'
 
@@ -508,8 +512,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)) {
@@ -528,8 +532,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)) {
@@ -548,8 +552,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)) {
@@ -568,8 +572,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)) {
@@ -588,8 +592,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)) {
@@ -635,8 +639,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)) {
@@ -717,8 +721,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)) {
@@ -737,8 +741,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)) {
@@ -764,8 +768,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)) {
@@ -788,8 +792,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)) {
@@ -816,8 +820,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)) {
@@ -844,8 +848,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)) {
@@ -871,8 +875,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)) {
@@ -987,8 +991,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)) {
@@ -1005,8 +1009,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)) {
@@ -1027,8 +1031,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)) {
@@ -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')
     }
 
     expect(request.headers['banana']).toBeUndefined()
@@ -1172,8 +1176,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
`@@ -5,7 +5,11 @@ import { HttpResponse, delay, http } from 'msw'`
`5`	`5`	`import nodeFetch from 'node-fetch'`
`6`	`6`	`import queryString from 'query-string'`
`7`	`7`	`import { vi } from 'vitest'`
`8`		`-import { hasBodyAndHeaders, setupApiStore } from '../../tests/utils/helpers'`
	`8`	`+import {`
	`9`	`+ hasBodyAndHeaders,`
	`10`	`+ isObject,`
	`11`	`+ setupApiStore,`
	`12`	`+} from '../../tests/utils/helpers'`
`9`	`13`	`import type { BaseQueryApi } from '../baseQueryTypes'`
`10`	`14`	`import { server } from './mocks/server'`
`11`	`15`
`@@ -508,8 +512,8 @@ describe('fetchBaseQuery', () => {`
`508`	`512`	`{},`
`509`	`513`	`)`
`510`	`514`
`511`		`- if (!hasBodyAndHeaders(request)) {`
`512`		`- expect.fail('Expected request to have body and headers')`
	`515`	`+ if (!isObject(request)) {`
	`516`	`+ expect.fail('Expected request to be an object')`
`513`	`517`	`}`
`514`	`518`
`515`	`519`	`if (!('url' in request)) {`
`@@ -528,8 +532,8 @@ describe('fetchBaseQuery', () => {`
`528`	`532`	`{},`
`529`	`533`	`)`
`530`	`534`
`531`		`- if (!hasBodyAndHeaders(request)) {`
`532`		`- expect.fail('Expected request to have body and headers')`
	`535`	`+ if (!isObject(request)) {`
	`536`	`+ expect.fail('Expected request to be an object')`
`533`	`537`	`}`
`534`	`538`
`535`	`539`	`if (!('url' in request)) {`
`@@ -548,8 +552,8 @@ describe('fetchBaseQuery', () => {`
`548`	`552`	`{},`
`549`	`553`	`)`
`550`	`554`
`551`		`- if (!hasBodyAndHeaders(request)) {`
`552`		`- expect.fail('Expected request to have body and headers')`
	`555`	`+ if (!isObject(request)) {`
	`556`	`+ expect.fail('Expected request to be an object')`
`553`	`557`	`}`
`554`	`558`
`555`	`559`	`if (!('url' in request)) {`
`@@ -568,8 +572,8 @@ describe('fetchBaseQuery', () => {`
`568`	`572`	`{},`
`569`	`573`	`)`
`570`	`574`
`571`		`- if (!hasBodyAndHeaders(request)) {`
`572`		`- expect.fail('Expected request to have body and headers')`
	`575`	`+ if (!isObject(request)) {`
	`576`	`+ expect.fail('Expected request to be an object')`
`573`	`577`	`}`
`574`	`578`
`575`	`579`	`if (!('url' in request)) {`
`@@ -588,8 +592,8 @@ describe('fetchBaseQuery', () => {`
`588`	`592`	`{},`
`589`	`593`	`)`
`590`	`594`
`591`		`- if (!hasBodyAndHeaders(request)) {`
`592`		`- expect.fail('Expected request to have body and headers')`
	`595`	`+ if (!isObject(request)) {`
	`596`	`+ expect.fail('Expected request to be an object')`
`593`	`597`	`}`
`594`	`598`
`595`	`599`	`if (!('url' in request)) {`
`@@ -635,8 +639,8 @@ describe('fetchBaseQuery', () => {`
`635`	`639`	`{},`
`636`	`640`	`)`
`637`	`641`
`638`		`- if (!hasBodyAndHeaders(request)) {`
`639`		`- expect.fail('Expected request to have body and headers')`
	`642`	`+ if (!isObject(request)) {`
	`643`	`+ expect.fail('Expected request to be an object')`
`640`	`644`	`}`
`641`	`645`
`642`	`646`	`if (!('url' in request)) {`
`@@ -717,8 +721,8 @@ describe('fetchBaseQuery', () => {`
`717`	`721`	`{},`
`718`	`722`	`)`
`719`	`723`
`720`		`- if (!hasBodyAndHeaders(request)) {`
`721`		`- expect.fail('Expected request to have body and headers')`
	`724`	`+ if (!isObject(request)) {`
	`725`	`+ expect.fail('Expected request to be an object')`
`722`	`726`	`}`
`723`	`727`
`724`	`728`	`if (!('url' in request)) {`
`@@ -737,8 +741,8 @@ describe('fetchBaseQuery', () => {`
`737`	`741`	`{},`
`738`	`742`	`)`
`739`	`743`
`740`		`- if (!hasBodyAndHeaders(request)) {`
`741`		`- expect.fail('Expected request to have body and headers')`
	`744`	`+ if (!isObject(request)) {`
	`745`	`+ expect.fail('Expected request to be an object')`
`742`	`746`	`}`
`743`	`747`
`744`	`748`	`if (!('url' in request)) {`
`@@ -764,8 +768,8 @@ describe('fetchBaseQuery', () => {`
`764`	`768`	`{},`
`765`	`769`	`)`
`766`	`770`
`767`		`- if (!hasBodyAndHeaders(request)) {`
`768`		`- expect.fail('Expected request to have body and headers')`
	`771`	`+ if (!isObject(request)) {`
	`772`	`+ expect.fail('Expected request to be an object')`
`769`	`773`	`}`
`770`	`774`
`771`	`775`	`if (!('url' in request)) {`
`@@ -788,8 +792,8 @@ describe('fetchBaseQuery', () => {`
`788`	`792`	`{},`
`789`	`793`	`)`
`790`	`794`
`791`		`- if (!hasBodyAndHeaders(request)) {`
`792`		`- expect.fail('Expected request to have body and headers')`
	`795`	`+ if (!isObject(request)) {`
	`796`	`+ expect.fail('Expected request to be an object')`
`793`	`797`	`}`
`794`	`798`
`795`	`799`	`if (!('url' in request)) {`
`@@ -816,8 +820,8 @@ describe('fetchBaseQuery', () => {`
`816`	`820`
`817`	`821`	`const { data: request } = await doRequest()`
`818`	`822`
`819`		`- if (!hasBodyAndHeaders(request)) {`
`820`		`- expect.fail('Expected request to have body and headers')`
	`823`	`+ if (!isObject(request)) {`
	`824`	`+ expect.fail('Expected request to be an object')`
`821`	`825`	`}`
`822`	`826`
`823`	`827`	`if (!('url' in request)) {`
`@@ -844,8 +848,8 @@ describe('fetchBaseQuery', () => {`
`844`	`848`
`845`	`849`	`const { data: request } = await doRequest()`
`846`	`850`
`847`		`- if (!hasBodyAndHeaders(request)) {`
`848`		`- expect.fail('Expected request to have body and headers')`
	`851`	`+ if (!isObject(request)) {`
	`852`	`+ expect.fail('Expected request to be an object')`
`849`	`853`	`}`
`850`	`854`
`851`	`855`	`if (!('url' in request)) {`
`@@ -871,8 +875,8 @@ describe('fetchBaseQuery', () => {`
`871`	`875`
`872`	`876`	`const { data: request } = await doRequest()`
`873`	`877`
`874`		`- if (!hasBodyAndHeaders(request)) {`
`875`		`- expect.fail('Expected request to have body and headers')`
	`878`	`+ if (!isObject(request)) {`
	`879`	`+ expect.fail('Expected request to be an object')`
`876`	`880`	`}`
`877`	`881`
`878`	`882`	`if (!('url' in request)) {`
`@@ -987,8 +991,8 @@ describe('fetchBaseQuery', () => {`
`987`	`991`
`988`	`992`	`const { data: request } = await doRequest()`
`989`	`993`
`990`		`- if (!hasBodyAndHeaders(request)) {`
`991`		`- expect.fail('Expected request to have body and headers')`
	`994`	`+ if (!isObject(request)) {`
	`995`	`+ expect.fail('Expected request to be an object')`
`992`	`996`	`}`
`993`	`997`
`994`	`998`	`if (!('url' in request)) {`
`@@ -1005,8 +1009,8 @@ describe('fetchBaseQuery', () => {`
`1005`	`1009`	`{},`
`1006`	`1010`	`)`
`1007`	`1011`
`1008`		`- if (!hasBodyAndHeaders(request)) {`
`1009`		`- expect.fail('Expected request to have body and headers')`
	`1012`	`+ if (!isObject(request)) {`
	`1013`	`+ expect.fail('Expected request to be an object')`
`1010`	`1014`	`}`
`1011`	`1015`
`1012`	`1016`	`if (!('url' in request)) {`
`@@ -1027,8 +1031,8 @@ describe('fetchBaseQuery', () => {`
`1027`	`1031`	`{},`
`1028`	`1032`	`)`
`1029`	`1033`
`1030`		`- if (!hasBodyAndHeaders(request)) {`
`1031`		`- expect.fail('Expected request to have body and headers')`
	`1034`	`+ if (!isObject(request)) {`
	`1035`	`+ expect.fail('Expected request to be an object')`
`1032`	`1036`	`}`
`1033`	`1037`
`1034`	`1038`	`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`	`expect(request.headers['banana']).toBeUndefined()`
`@@ -1172,8 +1176,8 @@ describe('fetchFn', () => {`
`1172`	`1176`	`{},`
`1173`	`1177`	`)`
`1174`	`1178`
`1175`		`- if (!hasBodyAndHeaders(request)) {`
`1176`		`- expect.fail('Expected request to have body and headers')`
	`1179`	`+ if (!isObject(request)) {`
	`1180`	`+ expect.fail('Expected request to be an object')`
`1177`	`1181`	`}`
`1178`	`1182`
`1179`	`1183`	`if (!('url' in request)) {`