Fix FormData tests

Author: aryaemami59

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

@@ -1,11 +1,11 @@
 import { createSlice } from '@reduxjs/toolkit'
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query'
 import nodeFetch from 'node-fetch'
-import { setupApiStore, waitMs } from './helpers'
+import { setupApiStore } from './helpers'
 import { server } from './mocks/server'
 
 import { headersToObject } from 'headers-polyfill'
-import { HttpResponse, http } from 'msw'
+import { HttpResponse, delay, http } from 'msw'
 import queryString from 'query-string'
 import type { BaseQueryApi } from '../baseQueryTypes'
 
@@ -1052,7 +1052,9 @@ describe('fetchFn', () => {
 describe('FormData', () => {
   test('sets the right headers when sending FormData', async () => {
     const body = new FormData()
+
     body.append('username', 'test')
+
     body.append(
       'file',
       new Blob([JSON.stringify({ hello: 'there' }, null, 2)], {
@@ -1065,7 +1067,9 @@ describe('FormData', () => {
       commonBaseQueryApi,
       {}
     )
+
     const request: any = res.data
+
     expect(request.headers['content-type']).not.toContain('application/json')
   })
 })

packages/toolkit/src/query/tests/mocks/handlers.ts

@@ -15,48 +15,47 @@ export const handlers = [
   http.get(
     'https://example.com/echo',
     async ({ request, params, cookies, requestId }) => {
-      return HttpResponse.json(
-        {
-          ...request,
-          params,
-          cookies,
-          requestId,
-          url: new URL(request.url),
-          headers: headersToObject(request.headers),
-        },
-        { headers: request.headers }
-      )
+      return HttpResponse.json({
+        ...request,
+        params,
+        cookies,
+        requestId,
+        url: new URL(request.url),
+        headers: headersToObject(request.headers),
+      })
     }
   ),
   http.post(
     'https://example.com/echo',
     async ({ request, cookies, params, requestId }) => {
-      const body = headersToObject(request.headers)['content-type'] === 'text/html'
-      ? await request.text()
-      : await request.json()
+      let body
 
-      return HttpResponse.json(
-        {
-          ...request,
-          cookies,
-          params,
-          requestId,
-          body,
-          url: new URL(request.url),
-          headers: request?.headers
-            ? headersToObject(request.headers)
-            : request?.headers,
-        },
-        { headers: request.headers }
-      )
+      try {
+        body =
+          headersToObject(request.headers)['content-type'] === 'text/html'
+            ? await request.text()
+            : await request.json()
+      } catch (err) {
+        body = request.body
+      }
+
+      return HttpResponse.json({
+        ...request,
+        cookies,
+        params,
+        requestId,
+        body,
+        url: new URL(request.url),
+        headers: headersToObject(request.headers),
+      })
     }
   ),
-  http.get('https://example.com/success', () => {
-    return HttpResponse.json({ value: 'success' })
-  }),
-  http.post('https://example.com/success', ({ request }) => {
-    return HttpResponse.json({ value: 'success' })
-  }),
+  http.get('https://example.com/success', () =>
+    HttpResponse.json({ value: 'success' })
+  ),
+  http.post('https://example.com/success', () =>
+    HttpResponse.json({ value: 'success' })
+  ),
   http.get('https://example.com/empty', () => new HttpResponse('')),
   http.get('https://example.com/error', () =>
     HttpResponse.json({ value: 'error' }, { status: 500 })