Fix timeout tests

Author: aryaemami59

packages/toolkit/src/query/tests/createApi.test.ts

@@ -681,7 +681,6 @@ describe('additional transformResponse behaviors', () => {
 
   test('transformResponse handles an async transformation and returns the merged data (query)', async () => {
     const result = await storeRef.store.dispatch(api.endpoints.query.initiate())
-    console.log(result)
 
     expect(result.data).toEqual({ value: 'success', banana: 'bread' })
   })
@@ -718,7 +717,6 @@ describe('additional transformResponse behaviors', () => {
         response: {
           headers: {
             'content-type': 'application/json',
-            // 'x-powered-by': 'msw',
           },
         },
       },
@@ -739,7 +737,6 @@ describe('additional transformResponse behaviors', () => {
         response: {
           headers: {
             'content-type': 'application/json',
-            // 'x-powered-by': 'msw',
           },
         },
       },

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

@@ -970,23 +970,25 @@ describe('fetchBaseQuery', () => {
     })
 
     test('Global timeout', async () => {
-      let reject: () => void
-      const donePromise = new Promise((resolve, _reject) => {
-        reject = _reject
-      })
       server.use(
         http.get(
           'https://example.com/empty1',
-          async ({ request, params, cookies, requestId }) => {
-            await Promise.race([waitMs(2000), donePromise])
+          async ({ request, cookies, params, requestId }) => {
+            await delay(300)
+
             return HttpResponse.json({
               ...request,
+              cookies,
+              params,
+              requestId,
+              url: new URL(request.url),
               headers: headersToObject(request.headers),
             })
           },
           { once: true }
         )
       )
+
       const globalizedBaseQuery = fetchBaseQuery({
         baseUrl,
         fetchFn: fetchFn as any,
@@ -1003,7 +1005,6 @@ describe('fetchBaseQuery', () => {
         status: 'TIMEOUT_ERROR',
         error: 'AbortError: The operation was aborted.',
       })
-      reject!()
     })
   })
 })
@@ -1089,33 +1090,34 @@ describe('still throws on completely unexpected errors', () => {
 
 describe('timeout', () => {
   test('throws a timeout error when a request takes longer than specified timeout duration', async () => {
-    let reject: () => void
-    const donePromise = new Promise((resolve, _reject) => {
-      reject = _reject
-    })
-
     server.use(
       http.get(
         'https://example.com/empty2',
-        async ({ request }) => {
-          await Promise.race([waitMs(3000), donePromise])
+        async ({ request, cookies, params, requestId }) => {
+          await delay(300)
+
           return HttpResponse.json({
             ...request,
+            url: new URL(request.url),
+            cookies,
+            params,
+            requestId,
             headers: headersToObject(request.headers),
           })
         },
         { once: true }
       )
     )
+
     const result = await baseQuery(
       { url: '/empty2', timeout: 200 },
       commonBaseQueryApi,
       {}
     )
+
     expect(result?.error).toEqual({
       status: 'TIMEOUT_ERROR',
       error: 'AbortError: The operation was aborted.',
     })
-    reject!()
   })
 })

packages/toolkit/vitest.config.mts

@@ -25,6 +25,6 @@ export default defineConfig({
       //'^@reduxjs/toolkit/dist/(.*)$': '<rootDir>/src/*',
       '@internal': path.join(__dirname, './src'),
     },
-    server: { deps: { inline: ['redux', '@reduxjs/toolkit'],  } },
+    server: { deps: { inline: ['redux', '@reduxjs/toolkit'] } },
   },
 })