chore: remove comment, remove unused test

Author: kettanaito

src/interceptors/http/index.ts

@@ -105,8 +105,6 @@ export class HttpRequestInterceptor extends Interceptor<HttpRequestEventMap> {
               if (!isRequestHandled) {
                 const passthroughSocket = socket.passthrough()
 
-                console.log('pas?')
-
                 /**
                  * @note Creating a passthroughsocket does NOT trigger the "socket" event
                  * from `http.ClientRequest` where the request, parser, and socket get

test/modules/http/intercept/http-client-request-agent.test.ts

@@ -21,7 +21,6 @@ beforeAll(async () => {
 })
 
 afterEach(() => {
-  vi.resetAllMocks()
   interceptor.removeAllListeners()
 })
 

test/modules/http/intercept/http-client-request.test.ts

@@ -18,17 +18,15 @@ const httpServer = new HttpServer((app) => {
   app.head('/user', handleUserRequest)
 })
 
-const resolver = vi.fn<(...args: HttpRequestEventMap['request']) => void>()
 const interceptor = new HttpRequestInterceptor()
-interceptor.on('request', resolver)
 
 beforeAll(async () => {
   await httpServer.listen()
   interceptor.apply()
 })
 
 afterEach(() => {
-  vi.resetAllMocks()
+  interceptor.removeAllListeners()
 })
 
 afterAll(async () => {
@@ -37,6 +35,10 @@ afterAll(async () => {
 })
 
 it('intercepts a HEAD request', async () => {
+  const requestListener =
+    vi.fn<(...args: HttpRequestEventMap['request']) => void>()
+  interceptor.on('request', requestListener)
+
   const url = httpServer.http.url('/user?id=123')
   const req = http.request(url, {
     method: 'HEAD',
@@ -47,9 +49,9 @@ it('intercepts a HEAD request', async () => {
   req.end()
   await waitForClientRequest(req)
 
-  expect(resolver).toHaveBeenCalledTimes(1)
+  expect(requestListener).toHaveBeenCalledTimes(1)
 
-  const [{ request, requestId, controller }] = resolver.mock.calls[0]
+  const [{ request, requestId, controller }] = requestListener.mock.calls[0]
 
   expect(request.method).toBe('HEAD')
   expect(request.url).toBe(url)
@@ -65,6 +67,10 @@ it('intercepts a HEAD request', async () => {
 })
 
 it('intercepts a GET request', async () => {
+  const requestListener =
+    vi.fn<(...args: HttpRequestEventMap['request']) => void>()
+  interceptor.on('request', requestListener)
+
   const url = httpServer.http.url('/user?id=123')
   const req = http.request(url, {
     method: 'GET',
@@ -75,9 +81,9 @@ it('intercepts a GET request', async () => {
   req.end()
   await waitForClientRequest(req)
 
-  expect(resolver).toHaveBeenCalledTimes(1)
+  expect(requestListener).toHaveBeenCalledTimes(1)
 
-  const [{ request, requestId, controller }] = resolver.mock.calls[0]
+  const [{ request, requestId, controller }] = requestListener.mock.calls[0]
 
   expect(request.method).toBe('GET')
   expect(request.url).toBe(url)
@@ -93,6 +99,10 @@ it('intercepts a GET request', async () => {
 })
 
 it('intercepts a POST request', async () => {
+  const requestListener =
+    vi.fn<(...args: HttpRequestEventMap['request']) => void>()
+  interceptor.on('request', requestListener)
+
   const url = httpServer.http.url('/user?id=123')
   const req = http.request(url, {
     method: 'POST',
@@ -106,9 +116,9 @@ it('intercepts a POST request', async () => {
 
   await waitForClientRequest(req)
 
-  expect(resolver).toHaveBeenCalledTimes(1)
+  expect(requestListener).toHaveBeenCalledTimes(1)
 
-  const [{ request, requestId, controller }] = resolver.mock.calls[0]
+  const [{ request, requestId, controller }] = requestListener.mock.calls[0]
 
   expect(request.method).toBe('POST')
   expect(request.url).toBe(url)
@@ -117,13 +127,17 @@ it('intercepts a POST request', async () => {
     'x-custom-header': 'yes',
   })
   expect(request.credentials).toBe('same-origin')
-  expect(await request.text()).toBe('post-payload')
+  await expect(request.text()).resolves.toBe('post-payload')
   expect(controller).toBeInstanceOf(RequestController)
 
   expect(requestId).toMatch(REQUEST_ID_REGEXP)
 })
 
 it('intercepts a PUT request', async () => {
+  const requestListener =
+    vi.fn<(...args: HttpRequestEventMap['request']) => void>()
+  interceptor.on('request', requestListener)
+
   const url = httpServer.http.url('/user?id=123')
   const req = http.request(url, {
     method: 'PUT',
@@ -136,9 +150,9 @@ it('intercepts a PUT request', async () => {
   req.end()
   await waitForClientRequest(req)
 
-  expect(resolver).toHaveBeenCalledTimes(1)
+  expect(requestListener).toHaveBeenCalledTimes(1)
 
-  const [{ request, requestId, controller }] = resolver.mock.calls[0]
+  const [{ request, requestId, controller }] = requestListener.mock.calls[0]
 
   expect(request.method).toBe('PUT')
   expect(request.url).toBe(url)
@@ -147,13 +161,17 @@ it('intercepts a PUT request', async () => {
     'x-custom-header': 'yes',
   })
   expect(request.credentials).toBe('same-origin')
-  expect(await request.text()).toBe('put-payload')
+  await expect(request.text()).resolves.toBe('put-payload')
   expect(controller).toBeInstanceOf(RequestController)
 
   expect(requestId).toMatch(REQUEST_ID_REGEXP)
 })
 
 it('intercepts a PATCH request', async () => {
+  const requestListener =
+    vi.fn<(...args: HttpRequestEventMap['request']) => void>()
+  interceptor.on('request', requestListener)
+
   const url = httpServer.http.url('/user?id=123')
   const req = http.request(url, {
     method: 'PATCH',
@@ -166,9 +184,9 @@ it('intercepts a PATCH request', async () => {
   req.end()
   await waitForClientRequest(req)
 
-  expect(resolver).toHaveBeenCalledTimes(1)
+  expect(requestListener).toHaveBeenCalledTimes(1)
 
-  const [{ request, requestId, controller }] = resolver.mock.calls[0]
+  const [{ request, requestId, controller }] = requestListener.mock.calls[0]
 
   expect(request.method).toBe('PATCH')
   expect(request.url).toBe(url)
@@ -177,13 +195,17 @@ it('intercepts a PATCH request', async () => {
     'x-custom-header': 'yes',
   })
   expect(request.credentials).toBe('same-origin')
-  expect(await request.text()).toBe('patch-payload')
+  await expect(request.text()).resolves.toBe('patch-payload')
   expect(controller).toBeInstanceOf(RequestController)
 
   expect(requestId).toMatch(REQUEST_ID_REGEXP)
 })
 
 it('intercepts a DELETE request', async () => {
+  const requestListener =
+    vi.fn<(...args: HttpRequestEventMap['request']) => void>()
+  interceptor.on('request', requestListener)
+
   const url = httpServer.http.url('/user?id=123')
   const req = http.request(url, {
     method: 'DELETE',
@@ -194,9 +216,9 @@ it('intercepts a DELETE request', async () => {
   req.end()
   await waitForClientRequest(req)
 
-  expect(resolver).toHaveBeenCalledTimes(1)
+  expect(requestListener).toHaveBeenCalledTimes(1)
 
-  const [{ request, requestId, controller }] = resolver.mock.calls[0]
+  const [{ request, requestId, controller }] = requestListener.mock.calls[0]
 
   expect(request.method).toBe('DELETE')
   expect(request.url).toBe(url)
@@ -212,6 +234,10 @@ it('intercepts a DELETE request', async () => {
 })
 
 it('intercepts an http.request given RequestOptions without a protocol', async () => {
+  const requestListener =
+    vi.fn<(...args: HttpRequestEventMap['request']) => void>()
+  interceptor.on('request', requestListener)
+
   // Create a request with `RequestOptions` without an explicit "protocol".
   // Since request is done via `http.get`, the "http:" protocol must be inferred.
   const req = http.request({
@@ -222,9 +248,9 @@ it('intercepts an http.request given RequestOptions without a protocol', async (
   req.end()
   await waitForClientRequest(req)
 
-  expect(resolver).toHaveBeenCalledTimes(1)
+  expect(requestListener).toHaveBeenCalledTimes(1)
 
-  const [{ request, requestId, controller }] = resolver.mock.calls[0]
+  const [{ request, requestId, controller }] = requestListener.mock.calls[0]
 
   expect(request.method).toBe('GET')
   expect(request.url).toBe(httpServer.http.url('/user?id=123'))
@@ -236,6 +262,10 @@ it('intercepts an http.request given RequestOptions without a protocol', async (
 })
 
 it('intercepts an http.request path in url and options', async () => {
+  const requestListener =
+    vi.fn<(...args: HttpRequestEventMap['request']) => void>()
+  interceptor.on('request', requestListener)
+
   const callback = vi.fn()
   const req = http.request(
     new URL(httpServer.http.url('/one')),
@@ -245,9 +275,9 @@ it('intercepts an http.request path in url and options', async () => {
   req.end()
   await waitForClientRequest(req)
 
-  expect(resolver).toHaveBeenCalledTimes(1)
+  expect(requestListener).toHaveBeenCalledTimes(1)
 
-  const [{ request, requestId, controller }] = resolver.mock.calls[0]
+  const [{ request, requestId, controller }] = requestListener.mock.calls[0]
 
   expect(request.method).toBe('GET')
   expect(request.url).toBe(httpServer.http.url('/two'))
@@ -260,6 +290,10 @@ it('intercepts an http.request path in url and options', async () => {
 })
 
 it('intercepts an http.request with custom "auth" option', async () => {
+  const requestListener =
+    vi.fn<(...args: HttpRequestEventMap['request']) => void>()
+  interceptor.on('request', requestListener)
+
   const auth = 'john:secret123'
   const req = http.request({
     host: httpServer.http.address.host,
@@ -269,9 +303,9 @@ it('intercepts an http.request with custom "auth" option', async () => {
   req.end()
   await waitForClientRequest(req)
 
-  expect(resolver).toHaveBeenCalledTimes(1)
+  expect(requestListener).toHaveBeenCalledTimes(1)
 
-  const [{ request }] = resolver.mock.calls[0]
+  const [{ request }] = requestListener.mock.calls[0]
 
   expect(request.method).toBe('GET')
   expect(request.url).toBe(httpServer.http.url('/'))
@@ -281,6 +315,10 @@ it('intercepts an http.request with custom "auth" option', async () => {
 })
 
 it('intercepts an http.request with a URL with "username" and "password"', async () => {
+  const requestListener =
+    vi.fn<(...args: HttpRequestEventMap['request']) => void>()
+  interceptor.on('request', requestListener)
+
   const username = 'john'
   const password = 'secret123'
   const req = http.request(
@@ -292,9 +330,9 @@ it('intercepts an http.request with a URL with "username" and "password"', async
   req.end()
   await waitForClientRequest(req)
 
-  expect(resolver).toHaveBeenCalledTimes(1)
+  expect(requestListener).toHaveBeenCalledTimes(1)
 
-  const [{ request }] = resolver.mock.calls[0]
+  const [{ request }] = requestListener.mock.calls[0]
 
   expect(request.method).toBe('GET')
   expect(request.url).toBe(httpServer.http.url('/'))

test/modules/http/intercept/http.request.test.ts

@@ -61,12 +61,6 @@ it('establishes actual server connection on passthrough', async () => {
   const connectListener = vi.fn()
   const errorListener = vi.fn()
 
-  /**
-   * @fixme Every "once" listener is fired multiple times.
-   * From the recordings, "once" is followed by "on" immediately
-   * as if it's implemented by it under the hood. Unit tests for the
-   * recorder fail to prove that.
-   */
   socket
     .once('connect', function connectOne() {
       socket.write([