Fix broken tests

Author: socsieng

.github/actions/test/action.yml

@@ -0,0 +1,9 @@
+name: Unit tests
+description: Run unit tests and ensure code quality
+
+runs:
+    using: 'composite'
+    steps:
+        - name: Run tests
+          run: pnpm test
+          shell: bash

.github/workflows/check.yml

@@ -13,4 +13,5 @@ jobs:
               uses: actions/checkout@v3
             - uses: ./.github/actions/pnpm-setup
             - uses: ./.github/actions/lint
+            - uses: ./.github/actions/test
             - uses: ./.github/actions/build-example

package.json

@@ -13,6 +13,7 @@
     "clean": "turbo run clean && rm -rf node_modules pnpm-lock.yaml",
     "lint": "eslint --ext .js,.ts,.tsx .",
     "lint:fix": "eslint --fix --ext .js,.ts,.tsx .",
+    "test": "turbo run test",
     "e2e:test": "turbo run e2e:test",
     "version": "./.changeset/version",
     "release": "./.changeset/release",

packages/open-next/src/converters/aws-cloudfront.ts

@@ -115,6 +115,7 @@ function convertToCloudfrontHeaders(
 ) {
   const cloudfrontHeaders: CloudFrontHeaders = {};
   Object.entries(headers)
+    .map(([key, value]) => [key.toLowerCase(), value] as const)
     .filter(
       ([key]) =>
         !CloudFrontBlacklistedHeaders.some((header) =>

packages/tests-unit/package.json

@@ -1,21 +1,23 @@
 {
   "name": "tests-unit",
   "private": true,
+  "type": "module",
   "scripts": {
     "clean": "rm -rf .turbo && rm -rf node_modules",
     "dev": "vitest",
     "test": "vitest run --coverage"
   },
   "dependencies": {
-    "@opennextjs/aws": "workspace:*",
-    "@open-next/utils": "workspace:*"
+    "@open-next/utils": "workspace:*",
+    "@opennextjs/aws": "workspace:*"
   },
   "devDependencies": {
     "@types/testing-library__jest-dom": "^5.14.9",
-    "@vitest/coverage-v8": "^0.34.1",
+    "@vitest/coverage-v8": "^2.1.3",
     "jsdom": "^22.1.0",
-    "vitest": "^0.34.1",
-    "vite": "4.4.9"
+    "vite": "5.4.9",
+    "vite-tsconfig-paths": "^5.0.1",
+    "vitest": "^2.1.3"
   },
   "version": null
 }

packages/tests-unit/tests/adapter.utils.test.ts

@@ -1,21 +1,23 @@
+import converter from "@opennextjs/aws/src/converters/aws-cloudfront.js";
 import { CloudFrontRequestResult } from "aws-lambda";
+import { Readable } from "stream";
+import { vi } from "vitest";
 
-//TODO: rewrite this test to use converter instead of event-mapper
-import { convertTo } from "../../open-next/src/adapters/event-mapper";
+vi.mock("@opennextjs/aws/src/adapters/config/index.js", () => ({}));
 
 describe("convertTo", () => {
   describe("CloudFront Result", () => {
-    it("Should parse the headers", () => {
-      const response = convertTo({
-        body: "",
+    it("Should parse the headers", async () => {
+      const response = (await converter.convertTo({
+        body: Readable.toWeb(Readable.from(Buffer.from(""))),
         headers: {
           "content-type": "application/json",
           test: "test",
         },
         isBase64Encoded: false,
         statusCode: 200,
         type: "cf",
-      }) as CloudFrontRequestResult;
+      })) as CloudFrontRequestResult;
 
       expect(response?.headers).toStrictEqual({
         "content-type": [
@@ -33,16 +35,16 @@ describe("convertTo", () => {
       });
     });
 
-    it("Should parse the headers with arrays", () => {
-      const response = convertTo({
-        body: "",
+    it("Should parse the headers with arrays", async () => {
+      const response = (await converter.convertTo({
+        body: Readable.toWeb(Readable.from(Buffer.from(""))),
         headers: {
           test: ["test1", "test2"],
         },
         isBase64Encoded: false,
         statusCode: 200,
         type: "cf",
-      }) as CloudFrontRequestResult;
+      })) as CloudFrontRequestResult;
 
       expect(response?.headers).toStrictEqual({
         test: [
@@ -58,17 +60,17 @@ describe("convertTo", () => {
       });
     });
 
-    it("Should parse the headers with cookies", () => {
-      const response = convertTo({
-        body: "",
+    it("Should parse the headers with cookies", async () => {
+      const response = (await converter.convertTo({
+        body: Readable.toWeb(Readable.from(Buffer.from(""))),
         headers: {
           "set-cookie":
             "test=1; Path=/; HttpOnly; Secure; SameSite=None, test=2; Path=/; HttpOnly; Secure; SameSite=None",
         },
         isBase64Encoded: false,
         statusCode: 200,
         type: "cf",
-      }) as CloudFrontRequestResult;
+      })) as CloudFrontRequestResult;
 
       expect(response?.headers).toStrictEqual({
         "set-cookie": [
@@ -84,17 +86,17 @@ describe("convertTo", () => {
       });
     });
 
-    it("Should parse the headers with cookies + expires", () => {
-      const response = convertTo({
-        body: "",
+    it("Should parse the headers with cookies + expires", async () => {
+      const response = (await converter.convertTo({
+        body: Readable.toWeb(Readable.from(Buffer.from(""))),
         headers: {
           "set-cookie":
             "test=1; Path=/; Expires=Sun, 14 Apr 2024 22:19:07 GMT; HttpOnly; Secure; SameSite=None, test=2; Path=/; Expires=Sun, 14 Apr 2024 22:19:07 GMT; HttpOnly; Secure; SameSite=None",
         },
         isBase64Encoded: false,
         statusCode: 200,
         type: "cf",
-      }) as CloudFrontRequestResult;
+      })) as CloudFrontRequestResult;
 
       expect(response?.headers).toStrictEqual({
         "set-cookie": [
@@ -113,9 +115,9 @@ describe("convertTo", () => {
     });
 
     describe("blacklisted headers", () => {
-      it("should remove all blacklisted or read-only headers from the response", () => {
-        const response = convertTo({
-          body: "",
+      it("should remove all blacklisted or read-only headers from the response", async () => {
+        const response = (await converter.convertTo({
+          body: Readable.toWeb(Readable.from(Buffer.from(""))),
           headers: {
             Connection: "keep-alive",
             expect: "100-continue",
@@ -157,7 +159,7 @@ describe("convertTo", () => {
           isBase64Encoded: false,
           statusCode: 200,
           type: "cf",
-        }) as CloudFrontRequestResult;
+        })) as CloudFrontRequestResult;
 
         expect(response?.headers).toStrictEqual({
           "x-powered-by": [

packages/tests-unit/tests/event-mapper.test.ts renamed to packages/tests-unit/tests/converters/aws-cloudfront.test.ts

@@ -0,0 +1,71 @@
+import {
+  convertToQuery,
+  convertToQueryString,
+} from "@opennextjs/aws/src/core/routing/util.js";
+import { vi } from "vitest";
+
+vi.mock("@opennextjs/aws/src/adapters/config/index.js", () => ({}));
+
+describe("convertToQueryString", () => {
+  it("returns an empty string for no queries", () => {
+    const query = {};
+    expect(convertToQueryString(query)).toBe("");
+  });
+
+  it("converts a single entry to one querystring parameter", () => {
+    const query = { key: "value" };
+    expect(convertToQueryString(query)).toBe("?key=value");
+  });
+
+  it("converts multiple distinct entries to a querystring parameter each", () => {
+    const query = { key: "value", another: "value2" };
+    expect(convertToQueryString(query)).toBe("?key=value&another=value2");
+  });
+
+  it("converts multi-value parameters to multiple key value pairs", () => {
+    const query = { key: ["value1", "value2"] };
+    expect(convertToQueryString(query)).toBe("?key=value1&key=value2");
+  });
+
+  it("converts mixed multi-value and single value parameters", () => {
+    const query = { key: ["value1", "value2"], another: "value3" };
+    expect(convertToQueryString(query)).toBe(
+      "?key=value1&key=value2&another=value3",
+    );
+  });
+});
+
+describe("convertToQuery", () => {
+  it("returns an empty object for empty string", () => {
+    const querystring = "";
+    expect(convertToQuery(querystring)).toEqual({});
+  });
+
+  it("converts a single querystring parameter to one query entry", () => {
+    const querystring = "key=value";
+    expect(convertToQuery(querystring)).toEqual({ key: "value" });
+  });
+
+  it("converts multiple distinct entries to an entry in the query", () => {
+    const querystring = "key=value&another=value2";
+    expect(convertToQuery(querystring)).toEqual({
+      key: "value",
+      another: "value2",
+    });
+  });
+
+  it("converts multi-value parameters to an array in the query", () => {
+    const querystring = "key=value1&key=value2";
+    expect(convertToQuery(querystring)).toEqual({
+      key: ["value1", "value2"],
+    });
+  });
+
+  it("converts mixed multi-value and single value parameters", () => {
+    const querystring = "key=value1&key=value2&another=value3";
+    expect(convertToQuery(querystring)).toEqual({
+      key: ["value1", "value2"],
+      another: "value3",
+    });
+  });
+});