fix(fetch): ensure response url

mswjs · Nov 15, 2024 · 37de1ed · 37de1ed
1 parent ee76bae
commit 37de1ed
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/src/interceptors/fetch/index.ts b/src/interceptors/fetch/index.ts
@@ -75,10 +75,9 @@ export class FetchInterceptor extends Interceptor<HttpRequestEventMap> {
           const response =
             decompressedStream === null
               ? rawResponse
-              : new FetchResponse(decompressedStream, {
-                  ...rawResponse,
-                  url: request.url,
-                })
+              : new FetchResponse(decompressedStream, rawResponse)
+
+          FetchResponse.setUrl(request.url, response)
 
           /**
            * Undici's handling of following redirect responses.

diff --git a/src/utils/fetchUtils.ts b/src/utils/fetchUtils.ts
@@ -27,6 +27,23 @@ export class FetchResponse extends Response {
     return !FetchResponse.STATUS_CODES_WITHOUT_BODY.includes(status)
   }
 
+  static setUrl(url: string | undefined, response: Response): void {
+    if (!url) {
+      return
+    }
+
+    if (response.url != null) {
+      return
+    }
+
+    Object.defineProperty(response, 'url', {
+      value: url,
+      enumerable: true,
+      configurable: true,
+      writable: false,
+    })
+  }
+
   constructor(body?: BodyInit | null, init: FetchResponseInit = {}) {
     const status = init.status ?? 200
     const safeStatus = FetchResponse.isConfigurableStatusCode(status)
@@ -60,13 +77,6 @@ export class FetchResponse extends Response {
       }
     }
 
-    if (init.url) {
-      Object.defineProperty(this, 'url', {
-        value: init.url,
-        enumerable: true,
-        configurable: true,
-        writable: false,
-      })
-    }
+    FetchResponse.setUrl(init.url, this)
   }
 }