test: migrate other http tests to socket interceptor

mswjs · Mar 5, 2024 · a755028 · a755028
1 parent 1c74f23
commit a755028
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/src/interceptors/Socket/SocketInterceptor.ts b/src/interceptors/Socket/SocketInterceptor.ts
@@ -1,4 +1,5 @@
 import net from 'node:net'
+import { STATUS_CODES } from 'node:http'
 import { HTTPParser } from 'node:_http_common'
 import { randomUUID } from 'node:crypto'
 import { Readable } from 'node:stream'
@@ -9,7 +10,7 @@ import {
   toInteractiveRequest,
 } from '../../utils/toInteractiveRequest'
 import { emitAsync } from '../../utils/emitAsync'
-import { STATUS_CODES } from 'node:http'
+import { isPropertyAccessible } from '../../utils/isPropertyAccessible'
 
 type NormalizedSocketConnectArgs = [
   options: NormalizedSocketConnectOptions,
@@ -108,6 +109,15 @@ export class SocketInterceptor extends Interceptor<SocketEventMap> {
         const mockedResponse = resolverResult.data
 
         if (mockedResponse) {
+          // Handle mocked "Response.error()" instances.
+          if (
+            isPropertyAccessible(mockedResponse, 'type') &&
+            mockedResponse.type === 'error'
+          ) {
+            socketWrap.errorWith(new TypeError('Network error'))
+            return
+          }
+
           socketWrap.respondWith(mockedResponse)
         } else {
           socketWrap.passthrough()

diff --git a/test/modules/http/http-performance.test.ts b/test/modules/http/http-performance.test.ts
@@ -1,6 +1,6 @@
 import { it, expect, beforeAll, afterAll } from 'vitest'
 import { HttpServer } from '@open-draft/test-server/http'
-import { ClientRequestInterceptor } from '../../../src/interceptors/ClientRequest'
+import { SocketInterceptor } from '../../../src/interceptors/Socket/SocketInterceptor'
 import { httpGet, PromisifiedResponse, useCors } from '../../helpers'
 
 function arrayWith<V>(length: number, mapFn: (index: number) => V): V[] {
@@ -28,7 +28,8 @@ const httpServer = new HttpServer((app) => {
   })
 })
 
-const interceptor = new ClientRequestInterceptor()
+const interceptor = new SocketInterceptor()
+
 interceptor.on('request', ({ request }) => {
   const url = new URL(request.url)
 

diff --git a/test/modules/http/response/http-response-delay.test.ts b/test/modules/http/response/http-response-delay.test.ts
@@ -2,9 +2,9 @@ import { it, expect, beforeAll, afterAll } from 'vitest'
 import http from 'http'
 import { HttpServer } from '@open-draft/test-server/http'
 import { sleep, waitForClientRequest } from '../../../helpers'
-import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
+import { SocketInterceptor } from '../../../../src/interceptors/Socket/SocketInterceptor'
 
-const interceptor = new ClientRequestInterceptor()
+const interceptor = new SocketInterceptor()
 
 const httpServer = new HttpServer((app) => {
   app.get('/resource', (req, res) => {
@@ -29,7 +29,7 @@ it('supports custom delay before responding with a mock', async () => {
   })
 
   const requestStart = Date.now()
-  const request = http.get('https://non-existing-host.com')
+  const request = http.get('http://non-existing-host.com')
   const { res, text } = await waitForClientRequest(request)
   const requestEnd = Date.now()
 

diff --git a/test/modules/http/response/http-response-error.test.ts b/test/modules/http/response/http-response-error.test.ts
@@ -1,9 +1,9 @@
 import { it, expect, beforeAll, afterAll } from 'vitest'
 import http from 'http'
-import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
+import { SocketInterceptor } from '../../../../src/interceptors/Socket/SocketInterceptor'
 import { DeferredPromise } from '@open-draft/deferred-promise'
 
-const interceptor = new ClientRequestInterceptor()
+const interceptor = new SocketInterceptor()
 
 interceptor.on('request', ({ request }) => {
   request.respondWith(Response.error())

diff --git a/test/modules/http/response/http-response-patching.test.ts b/test/modules/http/response/http-response-patching.test.ts
@@ -1,8 +1,7 @@
 import { it, expect, beforeAll, afterAll } from 'vitest'
 import http from 'http'
 import { HttpServer } from '@open-draft/test-server/http'
-import { BatchInterceptor } from '../../../../src'
-import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
+import { SocketInterceptor } from '../../../../src/interceptors/Socket/SocketInterceptor'
 import { sleep, waitForClientRequest } from '../../../helpers'
 
 const server = new HttpServer((app) => {
@@ -11,10 +10,7 @@ const server = new HttpServer((app) => {
   })
 })
 
-const interceptor = new BatchInterceptor({
-  name: 'response-patching',
-  interceptors: [new ClientRequestInterceptor()],
-})
+const interceptor = new SocketInterceptor()
 
 async function getResponse(request: Request): Promise<Response | undefined> {
   const url = new URL(request.url)