refactor: disposable server returns port too

Author: enisdenjo

src/__tests__/use.ts

@@ -16,7 +16,7 @@ import { createHandler as createFetchHandler } from '../use/fetch';
 import { createHandler as createKoaHandler } from '../use/koa';
 
 describe('http', () => {
-  const [url, dispose] = startDisposableServer(
+  const [url, , dispose] = startDisposableServer(
     http.createServer(createHttpHandler({ schema })),
   );
   afterAll(dispose);
@@ -31,7 +31,7 @@ describe('http', () => {
   }
 
   it('should allow manipulating the response from the request context', async () => {
-    const [url, dispose] = startDisposableServer(
+    const [url, , dispose] = startDisposableServer(
       http.createServer(
         createHttpHandler({
           schema,
@@ -63,7 +63,7 @@ describe('express', () => {
   const app = express();
   app.all('/', createExpressHandler({ schema }));
 
-  const [url, dispose] = startDisposableServer(app.listen(0));
+  const [url, , dispose] = startDisposableServer(app.listen(0));
   afterAll(dispose);
 
   for (const audit of serverAudits({ url, fetchFn: fetch })) {
@@ -88,7 +88,7 @@ describe('express', () => {
       }),
     );
 
-    const [url, dispose] = startDisposableServer(app.listen(0));
+    const [url, , dispose] = startDisposableServer(app.listen(0));
 
     const res = await fetch(url + '?query={hello}');
 
@@ -118,7 +118,7 @@ describe('fastify', () => {
   // call ready since we're not calling listen
   app.ready();
 
-  const [url, dispose] = startDisposableServer(app.server);
+  const [url, , dispose] = startDisposableServer(app.server);
   afterAll(dispose);
 
   for (const audit of serverAudits({ url, fetchFn: fetch })) {
@@ -147,7 +147,7 @@ describe('fastify', () => {
     // call ready since we're not calling listen
     app.ready();
 
-    const [url, dispose] = startDisposableServer(app.server);
+    const [url, , dispose] = startDisposableServer(app.server);
 
     const res = await fetch(url + '?query={hello}');
 
@@ -161,7 +161,7 @@ describe('fastify', () => {
 });
 
 describe('fetch', () => {
-  const [url, dispose] = startDisposableServer(
+  const [url, , dispose] = startDisposableServer(
     http.createServer(createServerAdapter(createFetchHandler({ schema }))),
   );
   afterAll(dispose);
@@ -180,7 +180,7 @@ describe('koa', () => {
   const app = new Koa();
   app.use(mount('/', createKoaHandler({ schema })));
 
-  const [url, dispose] = startDisposableServer(app.listen(0));
+  const [url, , dispose] = startDisposableServer(app.listen(0));
   afterAll(dispose);
 
   for (const audit of serverAudits({ url, fetchFn: fetch })) {
@@ -207,7 +207,7 @@ describe('koa', () => {
       ),
     );
 
-    const [url, dispose] = startDisposableServer(app.listen(0));
+    const [url, , dispose] = startDisposableServer(app.listen(0));
 
     const res = await fetch(url + '?query={hello}');
 

src/__tests__/utils/tserver.ts

@@ -28,7 +28,7 @@ export function startTServer(
     schema,
     ...handlerOptions,
   });
-  const [url, dispose] = startDisposableServer(
+  const [url, , dispose] = startDisposableServer(
     http.createServer(async (req, res) => {
       try {
         if (!req.url) {
@@ -78,7 +78,7 @@ export function startTServer(
  */
 export function startDisposableServer(
   server: http.Server,
-): [url: string, dispose: Dispose] {
+): [url: string, port: number, dispose: Dispose] {
   const sockets = new Set<net.Socket>();
   server.on('connection', (socket) => {
     sockets.add(socket);
@@ -100,5 +100,5 @@ export function startDisposableServer(
   const { port } = server.address() as net.AddressInfo;
   const url = `http://localhost:${port}`;
 
-  return [url, dispose];
+  return [url, port, dispose];
 }