fix(fetch): follow mocked redirect responses (#2268)

mswjs · Sep 8, 2024 · f5785bf · f5785bf
1 parent 8a46465
commit f5785bf
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -137,7 +137,7 @@
     "@bundled-es-modules/statuses": "^1.0.1",
     "@bundled-es-modules/tough-cookie": "^0.1.6",
     "@inquirer/confirm": "^3.0.0",
-    "@mswjs/interceptors": "^0.29.0",
+    "@mswjs/interceptors": "^0.35.0",
     "@open-draft/until": "^2.1.0",
     "@types/cookie": "^0.6.0",
     "@types/statuses": "^2.0.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/browser/setupWorker/start/createFallbackRequestListener.ts b/src/browser/setupWorker/start/createFallbackRequestListener.ts
@@ -18,7 +18,7 @@ export function createFallbackRequestListener(
     interceptors: [new FetchInterceptor(), new XMLHttpRequestInterceptor()],
   })
 
-  interceptor.on('request', async ({ request, requestId }) => {
+  interceptor.on('request', async ({ request, requestId, controller }) => {
     const requestCloneForLogs = request.clone()
 
     const response = await handleRequest(
@@ -43,7 +43,7 @@ export function createFallbackRequestListener(
     )
 
     if (response) {
-      request.respondWith(response)
+      controller.respondWith(response)
     }
   })
 

diff --git a/src/node/SetupServerCommonApi.ts b/src/node/SetupServerCommonApi.ts
@@ -52,21 +52,24 @@ export class SetupServerCommonApi
    * Subscribe to all requests that are using the interceptor object
    */
   private init(): void {
-    this.interceptor.on('request', async ({ request, requestId }) => {
-      const response = await handleRequest(
-        request,
-        requestId,
-        this.handlersController.currentHandlers(),
-        this.resolvedOptions,
-        this.emitter,
-      )
-
-      if (response) {
-        request.respondWith(response)
-      }
+    this.interceptor.on(
+      'request',
+      async ({ request, requestId, controller }) => {
+        const response = await handleRequest(
+          request,
+          requestId,
+          this.handlersController.currentHandlers(),
+          this.resolvedOptions,
+          this.emitter,
+        )
 
-      return
-    })
+        if (response) {
+          controller.respondWith(response)
+        }
+
+        return
+      },
+    )
 
     this.interceptor.on('unhandledException', ({ error }) => {
       if (error instanceof InternalError) {