test(integration): patch over IPv6 bug in upstream `@open-draft/test-…

…server` * Patch a bug in `@open-draft/test-server` which improperly serializes the host in IPv6 URLs * Fix the bug by patching the prototype and re-exporting it in a new file * Unfortunately, update every import of `@open-draft/test-server` to import the patched/re-exported version. Note: This commit is an atomic patch, so when the upstream bug is fixed, you can revert this commit to restore the imports and delete the patch.
mswjs · Sep 28, 2022 · 09198d9 · 09198d9
1 parent 0a3e56b
commit 09198d9
Show file tree

Hide file tree

Showing 42 changed files with 156 additions and 41 deletions.
diff --git a/src/interceptors/ClientRequest/NodeClientRequest.test.ts b/src/interceptors/ClientRequest/NodeClientRequest.test.ts
@@ -3,7 +3,7 @@
  */
 import { debug } from 'debug'
 import * as express from 'express'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../test/patched/OpenDraftTestServer'
 import { NodeClientRequest } from './NodeClientRequest'
 import { getIncomingMessageBody } from './utils/getIncomingMessageBody'
 import { normalizeClientRequestArgs } from './utils/normalizeClientRequestArgs'

diff --git a/src/interceptors/ClientRequest/index.test.ts b/src/interceptors/ClientRequest/index.test.ts
@@ -1,5 +1,5 @@
 import * as http from 'http'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../test/patched/OpenDraftTestServer'
 import { ClientRequestInterceptor } from '.'
 
 const httpServer = new HttpServer((app) => {

diff --git a/test/features/events/request.test.ts b/test/features/events/request.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 import * as http from 'http'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../patched/OpenDraftTestServer'
 import { HttpRequestEventMap } from '../../../src'
 import { createXMLHttpRequest, waitForClientRequest } from '../../helpers'
 import { anyUuid, headersContaining } from '../../jest.expect'

diff --git a/test/features/events/response.test.ts b/test/features/events/response.test.ts
@@ -4,7 +4,7 @@
 import * as https from 'https'
 import fetch from 'node-fetch'
 import waitForExpect from 'wait-for-expect'
-import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
+import { HttpServer, httpsAgent } from '../../patched/OpenDraftTestServer'
 import {
   HttpRequestEventMap,
   IsomorphicRequest,

diff --git a/test/modules/XMLHttpRequest/compliance/xhr-events-order.test.ts b/test/modules/XMLHttpRequest/compliance/xhr-events-order.test.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

diff --git a/test/modules/XMLHttpRequest/compliance/xhr-no-response-headers.test.ts b/test/modules/XMLHttpRequest/compliance/xhr-no-response-headers.test.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

diff --git a/test/modules/XMLHttpRequest/compliance/xhr-request-headers.test.ts b/test/modules/XMLHttpRequest/compliance/xhr-request-headers.test.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

diff --git a/test/modules/XMLHttpRequest/compliance/xhr-response-headers-case-sensitivity.test.ts b/test/modules/XMLHttpRequest/compliance/xhr-response-headers-case-sensitivity.test.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { createXMLHttpRequest } from '../../../helpers'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 

diff --git a/test/modules/XMLHttpRequest/compliance/xhr-response-headers.test.ts b/test/modules/XMLHttpRequest/compliance/xhr-response-headers.test.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

diff --git a/test/modules/XMLHttpRequest/compliance/xhr-timeout.test.ts b/test/modules/XMLHttpRequest/compliance/xhr-timeout.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  * @see https://github.com/mswjs/interceptors/issues/7
  */
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { sleep } from '../../../../test/helpers'
 import { createXMLHttpRequest } from '../../../helpers'

diff --git a/test/modules/XMLHttpRequest/intercept/XMLHttpRequest.browser.test.ts b/test/modules/XMLHttpRequest/intercept/XMLHttpRequest.browser.test.ts
@@ -3,7 +3,7 @@
  */
 import * as path from 'path'
 import { pageWith } from 'page-with'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { RequestHandler } from 'express-serve-static-core'
 import { createBrowserXMLHttpRequest } from '../../../helpers'
 import { IsomorphicRequest, IsomorphicResponse } from '../../../../src'

diff --git a/test/modules/XMLHttpRequest/intercept/XMLHttpRequest.test.ts b/test/modules/XMLHttpRequest/intercept/XMLHttpRequest.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 import type { RequestHandler } from 'express'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { IsomorphicRequest } from '../../../../src'
 import {
   XMLHttpRequestEventListener,

diff --git a/test/modules/XMLHttpRequest/response/xhr-response-patching.browser.test.ts b/test/modules/XMLHttpRequest/response/xhr-response-patching.browser.test.ts
@@ -3,7 +3,7 @@
  */
 import * as path from 'path'
 import { pageWith } from 'page-with'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { createBrowserXMLHttpRequest } from '../../../helpers'
 
 declare namespace window {

diff --git a/test/modules/XMLHttpRequest/response/xhr.browser.test.ts b/test/modules/XMLHttpRequest/response/xhr.browser.test.ts
@@ -3,7 +3,7 @@
  */
 import * as path from 'path'
 import { pageWith } from 'page-with'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import {
   createBrowserXMLHttpRequest,
   createRawBrowserXMLHttpRequest,

diff --git a/test/modules/XMLHttpRequest/response/xhr.test.ts b/test/modules/XMLHttpRequest/response/xhr.test.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

diff --git a/test/modules/fetch/intercept/fetch.browser.test.ts b/test/modules/fetch/intercept/fetch.browser.test.ts
@@ -3,7 +3,7 @@
  */
 import * as path from 'path'
 import { RequestHandler } from 'express'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { Response, pageWith, ScenarioApi } from 'page-with'
 import { extractRequestFromPage } from '../../../helpers'
 import { IsomorphicRequest } from '../../../../src'

diff --git a/test/modules/fetch/intercept/fetch.clone.browser.test.ts b/test/modules/fetch/intercept/fetch.clone.browser.test.ts
@@ -1,6 +1,6 @@
 import * as path from 'path'
 import { pageWith } from 'page-with'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 
 declare namespace window {
   export const fetchData: (url: RequestInfo) => Promise<void>

diff --git a/test/modules/fetch/intercept/fetch.request.browser.test.ts b/test/modules/fetch/intercept/fetch.request.browser.test.ts
@@ -3,7 +3,7 @@
  */
 import * as path from 'path'
 import { pageWith } from 'page-with'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { extractRequestFromPage } from '../../../helpers'
 import { anyUuid, headersContaining } from '../../../jest.expect'
 import { encodeBuffer } from '../../../../src/utils/bufferUtils'

diff --git a/test/modules/fetch/intercept/fetch.request.test.ts b/test/modules/fetch/intercept/fetch.request.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment node
  */
 import { Request } from 'node-fetch'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { HttpRequestEventMap } from '../../../../src'
 import { fetch } from '../../../helpers'
 import { anyUuid, headersContaining } from '../../../jest.expect'

diff --git a/test/modules/fetch/intercept/fetch.test.ts b/test/modules/fetch/intercept/fetch.test.ts
@@ -3,7 +3,7 @@
  */
 import fetch from 'node-fetch'
 import { RequestHandler } from 'express'
-import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
+import { HttpServer, httpsAgent } from '../../../patched/OpenDraftTestServer'
 import { HttpRequestEventMap } from '../../../../src'
 import { anyUuid, headersContaining } from '../../../jest.expect'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'

diff --git a/test/modules/fetch/response/fetch-response-patching.browser.test.ts b/test/modules/fetch/response/fetch-response-patching.browser.test.ts
@@ -3,7 +3,7 @@
  */
 import * as path from 'path'
 import { pageWith } from 'page-with'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { FetchInterceptor } from '../../../../src/interceptors/fetch'
 import { listToHeaders } from 'headers-polyfill'
 

diff --git a/test/modules/fetch/response/fetch.browser.test.ts b/test/modules/fetch/response/fetch.browser.test.ts
@@ -3,7 +3,7 @@
  */
 import * as path from 'path'
 import { pageWith } from 'page-with'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { listToHeaders } from 'headers-polyfill'
 import { FetchInterceptor } from '../../../../src/interceptors/fetch'
 

diff --git a/test/modules/fetch/response/fetch.test.ts b/test/modules/fetch/response/fetch.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment node
  */
 import fetch from 'node-fetch'
-import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
+import { HttpServer, httpsAgent } from '../../../patched/OpenDraftTestServer'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 
 const httpServer = new HttpServer((app) => {

diff --git a/test/modules/http/compliance/http-rate-limit.test.ts b/test/modules/http/compliance/http-rate-limit.test.ts
@@ -1,6 +1,6 @@
 import * as http from 'http'
 import rateLimit from 'express-rate-limit'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 
 const httpServer = new HttpServer((app) => {

diff --git a/test/modules/http/compliance/http-req-callback.test.ts b/test/modules/http/compliance/http-req-callback.test.ts
@@ -3,7 +3,7 @@
  */
 import { IncomingMessage } from 'http'
 import * as https from 'https'
-import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
+import { HttpServer, httpsAgent } from '../../../patched/OpenDraftTestServer'
 import { getRequestOptionsByUrl } from '../../../../src/utils/getRequestOptionsByUrl'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 

diff --git a/test/modules/http/compliance/http-req-write.test.ts b/test/modules/http/compliance/http-req-write.test.ts
@@ -3,7 +3,7 @@
  */
 import * as http from 'http'
 import * as express from 'express'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { NodeClientRequest } from '../../../../src/interceptors/ClientRequest/NodeClientRequest'
 import { waitForClientRequest } from '../../../helpers'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'

diff --git a/test/modules/http/compliance/http-res-read-multiple-times.test.ts b/test/modules/http/compliance/http-res-read-multiple-times.test.ts
@@ -4,7 +4,7 @@
  * @see https://github.com/mswjs/interceptors/issues/161
  */
 import http, { IncomingMessage } from 'http'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { HttpRequestEventMap, IsomorphicResponse } from '../../../../src'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 

diff --git a/test/modules/http/compliance/http-res-set-encoding.test.ts b/test/modules/http/compliance/http-res-set-encoding.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment node
  */
 import * as http from 'http'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 
 const httpServer = new HttpServer((app) => {

diff --git a/test/modules/http/compliance/https-constructor.test.ts b/test/modules/http/compliance/https-constructor.test.ts
@@ -4,7 +4,7 @@
  */
 import * as https from 'https'
 import { URL } from 'url'
-import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
+import { HttpServer, httpsAgent } from '../../../patched/OpenDraftTestServer'
 import { getIncomingMessageBody } from '../../../../src/interceptors/ClientRequest/utils/getIncomingMessageBody'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 

diff --git a/test/modules/http/http-performance.test.ts b/test/modules/http/http-performance.test.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment node
  */
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../patched/OpenDraftTestServer'
 import { ClientRequestInterceptor } from '../../../src/interceptors/ClientRequest'
 import { httpGet, PromisifiedResponse } from '../../helpers'
 

diff --git a/test/modules/http/intercept/http.get.test.ts b/test/modules/http/intercept/http.get.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment node
  */
 import * as http from 'http'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 import { anyUuid, headersContaining } from '../../../jest.expect'
 import { waitForClientRequest } from '../../../helpers'

diff --git a/test/modules/http/intercept/http.request.test.ts b/test/modules/http/intercept/http.request.test.ts
@@ -3,7 +3,7 @@
  */
 import * as http from 'http'
 import { RequestHandler } from 'express-serve-static-core'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { anyUuid, headersContaining } from '../../../jest.expect'
 import { waitForClientRequest } from '../../../helpers'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'

diff --git a/test/modules/http/intercept/https.get.test.ts b/test/modules/http/intercept/https.get.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment node
  */
 import * as https from 'https'
-import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
+import { HttpServer, httpsAgent } from '../../../patched/OpenDraftTestServer'
 import { anyUuid, headersContaining } from '../../../jest.expect'
 import { waitForClientRequest } from '../../../helpers'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'

diff --git a/test/modules/http/intercept/https.request.test.ts b/test/modules/http/intercept/https.request.test.ts
@@ -3,7 +3,7 @@
  */
 import * as https from 'https'
 import { RequestHandler } from 'express'
-import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
+import { HttpServer, httpsAgent } from '../../../patched/OpenDraftTestServer'
 import { waitForClientRequest } from '../../../helpers'
 import { anyUuid, headersContaining } from '../../../jest.expect'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'

diff --git a/test/modules/http/regressions/http-concurrent-different-response-source.test.ts b/test/modules/http/regressions/http-concurrent-different-response-source.test.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment node
  */
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { httpGet } from '../../../helpers'
 import { sleep } from '../../../../test/helpers'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'

diff --git a/test/modules/http/regressions/http-socket-timeout.ts b/test/modules/http/regressions/http-socket-timeout.ts
@@ -5,7 +5,7 @@
  * due to the unterminated socket.
  */
 import * as http from 'http'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 
 jest.setTimeout(5000)

diff --git a/test/modules/http/response/http-https.test.ts b/test/modules/http/response/http-https.test.ts
@@ -3,7 +3,7 @@
  */
 import * as http from 'http'
 import * as https from 'https'
-import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
+import { HttpServer, httpsAgent } from '../../../patched/OpenDraftTestServer'
 import { waitForClientRequest } from '../../../helpers'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 

diff --git a/test/modules/http/response/http-response-patching.test.ts b/test/modules/http/response/http-response-patching.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment node
  */
 import * as http from 'http'
-import { HttpServer } from '@open-draft/test-server/http'
+import { HttpServer } from '../../../patched/OpenDraftTestServer'
 import { BatchInterceptor, MockedResponse } from '../../../../src'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'