getting the tests passing

Author: aaronpowell

src/__tests__/mockServer.ts

@@ -4,6 +4,7 @@ import type {
   HttpMethod,
   HttpRequest,
   HttpRequestHeaders,
+  HttpRequestQuery,
   Logger,
 } from '@azure/functions';
 import type {
@@ -13,7 +14,6 @@ import type {
   ServerResponse,
 } from 'http';
 import type { AddressInfo } from 'net';
-import { format } from 'url';
 
 export function urlForHttpServer(httpServer: Server): string {
   const { address, port } = httpServer.address() as AddressInfo;
@@ -25,12 +25,7 @@ export function urlForHttpServer(httpServer: Server): string {
   // when listening).
   const hostname = address === '' || address === '::' ? 'localhost' : address;
 
-  return format({
-    protocol: 'http',
-    hostname,
-    port,
-    pathname: '/',
-  });
+  return `http://${hostname}:${port}`;
 }
 
 export const createMockServer = (handler: AzureFunction) => {
@@ -41,10 +36,10 @@ export const createMockServer = (handler: AzureFunction) => {
     req.on('end', async () => {
       const azReq: HttpRequest = {
         method: (req.method as HttpMethod) || null,
-        url: req.url || '',
+        url: new URL(req.url || '', 'http://localhost').toString(),
         headers: processHeaders(req.headers),
         body,
-        query: {},
+        query: processQuery(req.url),
         params: {},
         user: null,
         parseFormBody: () => {
@@ -86,6 +81,24 @@ export const createMockServer = (handler: AzureFunction) => {
   };
 };
 
+const processQuery: (url: string | undefined) => HttpRequestQuery = (url) => {
+  if (!url) {
+    return {};
+  }
+
+  const uri = new URL(url, 'http://localhost');
+
+  const query: HttpRequestQuery = {};
+  for (const [key, value] of uri.searchParams.entries()) {
+    if (query[key] !== undefined) {
+      query[key] = `${query[key]},${value}`;
+    } else {
+      query[key] = value;
+    }
+  }
+  return query;
+};
+
 const processHeaders: (headers: IncomingHttpHeaders) => HttpRequestHeaders = (
   headers,
 ) => {

src/index.ts

@@ -3,7 +3,6 @@ import type {
   Context,
   HttpRequest,
   HttpRequestHeaders,
-  HttpRequestQuery,
 } from '@azure/functions';
 import {
   ApolloServer,
@@ -55,7 +54,7 @@ export function startServerAndCreateHandler<TContext extends BaseContext>(
       }
 
       return {
-        statusCode: status || 200,
+        status: status || 200,
         headers: {
           ...Object.fromEntries(headers),
           'content-length': Buffer.byteLength(body.string).toString(),
@@ -65,7 +64,7 @@ export function startServerAndCreateHandler<TContext extends BaseContext>(
     } catch (e) {
       context.log.error('Failure processing GraphQL request', e);
       return {
-        statusCode: 400,
+        status: 400,
         body: (e as Error).message,
       };
     }
@@ -80,28 +79,30 @@ function normalizeRequest(req: HttpRequest): HTTPGraphQLRequest {
   return {
     method: req.method,
     headers: normalizeHeaders(req.headers),
-    search: normalizeQueryStringParams(req.query),
-    body: req.body,
+    search: new URL(req.url).search,
+    body: parseBody(req.body, req.headers['content-type']),
   };
 }
 
+function parseBody(
+  body: string | null | undefined,
+  contentType: string | undefined,
+): object | string {
+  if (body) {
+    if (contentType === 'application/json' && typeof body === 'string') {
+      return JSON.parse(body);
+    }
+    if (contentType === 'text/plain') {
+      return body;
+    }
+  }
+  return '';
+}
+
 function normalizeHeaders(headers: HttpRequestHeaders): HeaderMap {
   const headerMap = new HeaderMap();
   for (const [key, value] of Object.entries(headers)) {
     headerMap.set(key, value ?? '');
   }
   return headerMap;
 }
-
-function normalizeQueryStringParams(
-  queryStringParams: HttpRequestQuery | null,
-): string {
-  const queryStringRecord: Record<string, string> = {};
-  for (const [key, value] of Object.entries(queryStringParams ?? {})) {
-    queryStringRecord[key] = value ?? '';
-  }
-  return Object.keys(queryStringRecord).reduce(
-    (acc, key) => `${acc}&${key}=${queryStringRecord[key]}`,
-    '',
-  );
-}