Renames "urlToOptions" to "getRequestOptionsByUrl"

mswjs · Jun 13, 2020 · e88c118 · e88c118
1 parent 1742c6b
commit e88c118
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 18 deletions.
diff --git a/src/http/ClientRequest/normalizeHttpRequestParams.ts b/src/http/ClientRequest/normalizeHttpRequestParams.ts
@@ -1,6 +1,6 @@
 import { RequestOptions } from 'https'
 import { HttpRequestCallback } from '../../glossary'
-import { urlToOptions } from '../../utils/urlToOptions'
+import { getRequestOptionsByUrl } from '../../utils/getRequestOptionsByUrl'
 
 const debug = require('debug')('http:normalize-http-request-params')
 
@@ -26,7 +26,7 @@ function resolveRequestOptions(
   // Calling `fetch` provides only URL to ClientRequest,
   // without RequestOptions or callback.
   if (['function', 'undefined'].includes(typeof args[1])) {
-    return urlToOptions(url)
+    return getRequestOptionsByUrl(url)
   }
 
   return args[1] as RequestOptions

diff --git a/src/utils/urlToOptions.ts → src/utils/getRequestOptionsByUrl.ts b/src/utils/urlToOptions.ts → src/utils/getRequestOptionsByUrl.ts
@@ -1,11 +1,11 @@
 import { RequestOptions } from 'http'
 
 /**
- * Converts a URL instance into an ordinary object expected by
- * the `http.request`/`https.request` calls.
+ * Converts a URL instance into the RequestOptions object expected by
+ * the `ClientRequest` class.
  * @see https://github.com/nodejs/node/blob/908292cf1f551c614a733d858528ffb13fb3a524/lib/internal/url.js#L1257
  */
-export function urlToOptions(url: URL): RequestOptions {
+export function getRequestOptionsByUrl(url: URL): RequestOptions {
   const options: RequestOptions = {
     method: 'GET',
     protocol: url.protocol,

diff --git a/test/helpers.ts b/test/helpers.ts
@@ -1,12 +1,13 @@
 import https from 'https'
 import http, { IncomingMessage, RequestOptions } from 'http'
 import nodeFetch, { Response, RequestInfo, RequestInit } from 'node-fetch'
-import { urlToOptions } from '../src/utils/urlToOptions'
+import { getRequestOptionsByUrl } from '../src/utils/getRequestOptionsByUrl'
 import { InterceptedRequest } from '../src/glossary'
 import { getCleanUrl } from '../src/utils/getCleanUrl'
 
 interface PromisifiedResponse {
   res: IncomingMessage
+  resBody: string
   url: string
   options: RequestOptions
 }
@@ -15,15 +16,22 @@ export function httpGet(
   url: string,
   options?: RequestOptions
 ): Promise<PromisifiedResponse> {
+  let resBody = ''
   const parsedUrl = new URL(url)
-  const resolvedOptions = Object.assign({}, urlToOptions(parsedUrl), options)
+  const resolvedOptions = Object.assign(
+    {},
+    getRequestOptionsByUrl(parsedUrl),
+    options
+  )
 
   return new Promise((resolve, reject) => {
     http.get(resolvedOptions, (res) => {
       res.setEncoding('utf8')
-      res.on('data', () => null)
+      res.on('data', (chunk) => (resBody += chunk))
       res.on('error', reject)
-      res.on('end', () => resolve({ res, url, options: resolvedOptions }))
+      res.on('end', () =>
+        resolve({ res, resBody, url, options: resolvedOptions })
+      )
     })
   })
 }
@@ -32,15 +40,22 @@ export function httpsGet(
   url: string,
   options?: RequestOptions
 ): Promise<PromisifiedResponse> {
+  let resBody = ''
   const parsedUrl = new URL(url)
-  const resolvedOptions = Object.assign({}, urlToOptions(parsedUrl), options)
+  const resolvedOptions = Object.assign(
+    {},
+    getRequestOptionsByUrl(parsedUrl),
+    options
+  )
 
   return new Promise((resolve, reject) => {
     https.get(resolvedOptions, (res) => {
       res.setEncoding('utf8')
-      res.on('data', () => null)
+      res.on('data', (chunk) => (resBody += chunk))
       res.on('error', reject)
-      res.on('end', () => resolve({ res, url, options: resolvedOptions }))
+      res.on('end', () =>
+        resolve({ res, resBody, url, options: resolvedOptions })
+      )
     })
   })
 }
@@ -50,15 +65,22 @@ export function httpRequest(
   options?: RequestOptions,
   body?: string
 ): Promise<PromisifiedResponse> {
+  let resBody = ''
   const parsedUrl = new URL(url)
-  const resolvedOptions = Object.assign({}, urlToOptions(parsedUrl), options)
+  const resolvedOptions = Object.assign(
+    {},
+    getRequestOptionsByUrl(parsedUrl),
+    options
+  )
 
   return new Promise((resolve, reject) => {
     const req = http.request(resolvedOptions, (res) => {
       res.setEncoding('utf8')
-      res.on('data', () => null)
+      res.on('data', (chunk) => (resBody += chunk))
       res.on('error', reject)
-      res.on('end', () => resolve({ res, url, options: resolvedOptions }))
+      res.on('end', () =>
+        resolve({ res, resBody, url, options: resolvedOptions })
+      )
     })
 
     if (body) {
@@ -74,15 +96,22 @@ export function httpsRequest(
   options?: RequestOptions,
   body?: string
 ): Promise<PromisifiedResponse> {
+  let resBody = ''
   const parsedUrl = new URL(url)
-  const resolvedOptions = Object.assign({}, urlToOptions(parsedUrl), options)
+  const resolvedOptions = Object.assign(
+    {},
+    getRequestOptionsByUrl(parsedUrl),
+    options
+  )
 
   return new Promise((resolve, reject) => {
     const req = https.request(resolvedOptions, (res) => {
       res.setEncoding('utf8')
-      res.on('data', () => null)
+      res.on('data', (chunk) => (resBody += chunk))
       res.on('error', reject)
-      res.on('end', () => resolve({ res, url, options: resolvedOptions }))
+      res.on('end', () =>
+        resolve({ res, resBody, url, options: resolvedOptions })
+      )
     })
 
     if (body) {