chore: use "httpServer" namespace consistently (#174)

test/compliance/XMLHttpRequest/events-order.test.ts

@@ -8,7 +8,7 @@ import { createXMLHttpRequest } from '../../helpers'
 
 type EventPool = [string, number][]
 
-let server: ServerApi
+let httpServer: ServerApi
 const interceptor = createInterceptor({
   modules: [interceptXMLHttpRequest],
   resolver(request) {
@@ -44,7 +44,7 @@ function spyOnEvents(request: XMLHttpRequest, pool: EventPool) {
 }
 
 beforeAll(async () => {
-  server = await createServer((app) => {
+  httpServer = await createServer((app) => {
     app.get('/', (req, res) => {
       res.status(200).end()
     })
@@ -59,14 +59,14 @@ afterEach(() => {
 })
 
 afterAll(async () => {
-  await server.close()
+  await httpServer.close()
 })
 
 test('emits correct events sequence for an unhandled request with no response body', async () => {
   interceptor.apply()
   const mockEvents: EventPool = []
   const request = await createXMLHttpRequest((request) => {
-    request.open('GET', server.http.makeUrl())
+    request.open('GET', httpServer.http.makeUrl())
     spyOnEvents(request, mockEvents)
   })
 
@@ -90,7 +90,7 @@ test('emits correct events sequence for a handled request with no response body'
   interceptor.apply()
   const mockEvents: EventPool = []
   const request = await createXMLHttpRequest((request) => {
-    request.open('GET', server.http.makeUrl('/user'))
+    request.open('GET', httpServer.http.makeUrl('/user'))
     spyOnEvents(request, mockEvents)
   })
 
@@ -108,7 +108,7 @@ test('emits correct events sequence for an unhandled request with a response bod
   interceptor.apply()
   const mockEvents: EventPool = []
   const request = await createXMLHttpRequest((request) => {
-    request.open('GET', server.http.makeUrl('/numbers'))
+    request.open('GET', httpServer.http.makeUrl('/numbers'))
     spyOnEvents(request, mockEvents)
   })
 
@@ -132,7 +132,7 @@ test('emits correct events sequence for a handled request with a response body',
   interceptor.apply()
   const mockEvents: EventPool = []
   const request = await createXMLHttpRequest((request) => {
-    request.open('GET', server.http.makeUrl('/numbers-mock'))
+    request.open('GET', httpServer.http.makeUrl('/numbers-mock'))
     spyOnEvents(request, mockEvents)
   })
 

test/compliance/XMLHttpRequest/request-headers.test.ts

@@ -6,7 +6,7 @@ import { createInterceptor } from '../../../src'
 import { interceptXMLHttpRequest } from '../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../helpers'
 
-let server: ServerApi
+let httpServer: ServerApi
 let rawRequestHeaders: string[]
 
 const interceptor = createInterceptor({
@@ -19,7 +19,7 @@ beforeAll(async () => {
 
   // Handle the request in an actual server
   // to inspect the raw request headers.
-  server = await createServer((app) => {
+  httpServer = await createServer((app) => {
     app.get('/', (req, res) => {
       rawRequestHeaders = req.rawHeaders
       res.status(200).end()
@@ -29,12 +29,12 @@ beforeAll(async () => {
 
 afterAll(async () => {
   interceptor.restore()
-  await server.close()
+  await httpServer.close()
 })
 
 test('request headers casing', async () => {
   await createXMLHttpRequest((req) => {
-    req.open('GET', server.http.makeUrl('/'))
+    req.open('GET', httpServer.http.makeUrl('/'))
     req.setRequestHeader('X-Custom-Token', 'abc-123')
   })
 

test/events/request.test.ts

@@ -9,7 +9,7 @@ import { interceptClientRequest } from '../../src/interceptors/ClientRequest'
 import { createXMLHttpRequest, httpRequest } from '../helpers'
 
 let requests: IsomorphicRequest[] = []
-let server: ServerApi
+let httpServer: ServerApi
 const interceptor = createInterceptor({
   modules: [interceptClientRequest, interceptXMLHttpRequest],
   resolver() {},
@@ -20,7 +20,7 @@ interceptor.on('request', (request) => {
 })
 
 beforeAll(async () => {
-  server = await createServer((app) => {
+  httpServer = await createServer((app) => {
     app.post('/user', (req, res) => {
       res.status(201).end()
     })
@@ -35,12 +35,12 @@ afterEach(() => {
 
 afterAll(async () => {
   interceptor.restore()
-  await server.close()
+  await httpServer.close()
 })
 
 it('ClientRequest: emits the "request" event upon the request', (done) => {
   const request = http.request(
-    server.http.makeUrl('/user'),
+    httpServer.http.makeUrl('/user'),
     {
       method: 'POST',
       headers: {
@@ -52,7 +52,7 @@ it('ClientRequest: emits the "request" event upon the request', (done) => {
       const [request] = requests
 
       expect(request.method).toEqual('POST')
-      expect(request.url.href).toEqual(server.http.makeUrl('/user'))
+      expect(request.url.href).toEqual(httpServer.http.makeUrl('/user'))
       expect(request.headers.get('content-type')).toEqual('application/json')
       expect(request.body).toEqual(JSON.stringify({ userId: 'abc-123' }))
       done()
@@ -64,7 +64,7 @@ it('ClientRequest: emits the "request" event upon the request', (done) => {
 
 it('XMLHttpRequest: emits the "request" event upon the request', async () => {
   await createXMLHttpRequest((request) => {
-    request.open('POST', server.http.makeUrl('/user'))
+    request.open('POST', httpServer.http.makeUrl('/user'))
     request.setRequestHeader('Content-Type', 'application/json')
     request.send(JSON.stringify({ userId: 'abc-123' }))
   })
@@ -79,7 +79,7 @@ it('XMLHttpRequest: emits the "request" event upon the request', async () => {
 
   const [request] = requests
   expect(request.method).toEqual('POST')
-  expect(request.url.href).toEqual(server.http.makeUrl('/user'))
+  expect(request.url.href).toEqual(httpServer.http.makeUrl('/user'))
   expect(request.headers.get('content-type')).toEqual('application/json')
   expect(request.body).toEqual(
     JSON.stringify({

test/integrations/got.test.ts

@@ -6,11 +6,11 @@ import { ServerApi, createServer } from '@open-draft/test-server'
 import { createInterceptor } from '../../src'
 import { interceptClientRequest } from '../../src/interceptors/ClientRequest'
 
-let server: ServerApi
+let httpServer: ServerApi
 const interceptor = createInterceptor({
   modules: [interceptClientRequest],
   resolver(request) {
-    if (request.url.toString() === server.http.makeUrl('/test')) {
+    if (request.url.toString() === httpServer.http.makeUrl('/test')) {
       return {
         status: 200,
         body: 'mocked-body',
@@ -20,7 +20,7 @@ const interceptor = createInterceptor({
 })
 
 beforeAll(async () => {
-  server = await createServer((app) => {
+  httpServer = await createServer((app) => {
     app.get('/user', (req, res) => {
       return res.status(200).json({ id: 1 })
     })
@@ -31,18 +31,18 @@ beforeAll(async () => {
 
 afterAll(async () => {
   interceptor.restore()
-  await server.close()
+  await httpServer.close()
 })
 
 test('mocks response to a request made with "got"', async () => {
-  const res = await got(server.http.makeUrl('/test'))
+  const res = await got(httpServer.http.makeUrl('/test'))
 
   expect(res.statusCode).toBe(200)
   expect(res.body).toBe('mocked-body')
 })
 
 test('bypasses an unhandled request made with "got"', async () => {
-  const res = await got(server.http.makeUrl('/user'))
+  const res = await got(httpServer.http.makeUrl('/user'))
 
   expect(res.statusCode).toBe(200)
   expect(res.body).toEqual(`{"id":1}`)