tests: fix header comparison and multiple-set-cookie tests (#846)

Author: Guy Bedford

integration-tests/js-compute/compare-headers.js

@@ -1,35 +1,68 @@
 /**
- * 
+ *
  * @param {[
-        [string, string]
-      ]} configHeaders
+ *   [string, string | string[]]
+ * ] | Record<string, string | string[]>} configHeaders
  * @param {Headers | {
-        [string]: string
-      }} wasmModuleHeaders
+ *   [string]: string
+ * }} wasmModuleHeaders
  * @returns
  */
-const compareHeaders = (configHeaders, wasmModuleHeaders) => {
 
+const compareHeaders = (configHeaders, wasmModuleHeaders) => {
   if (!configHeaders) {
     return;
   }
 
-  for (const [configHeaderKey, configHeaderValue] of Object.entries(configHeaders)) {
-    let wasmModuleHeaderValue = wasmModuleHeaders[configHeaderKey.toLowerCase()]
-    if (wasmModuleHeaderValue === null) {
-      throw new Error(`[Header Key mismatch] Expected: ${configHeaderKey} - Got: ${null}`);
-    } else if (Array.isArray(configHeaderValue)) {
-      if (Array.isArray(configHeaderValue)) {
-        for (let value of configHeaderValue) {
-          if (!configHeaderValue.includes(value)) {
-            throw new Error(`[Header mismatch] Missing header named "${configHeaderKey}" with value "${value}"`);
+  // convert an array of entries into an object of arrays for easier asserting
+  if (Array.isArray(configHeaders)) {
+    const combinedHeaders = Object.create(null);
+    for (const [key, val] of configHeaders) {
+      if (!Object.hasOwnProperty.call(combinedHeaders, key)) {
+        combinedHeaders[key] = val;
+      } else {
+        if (Array.isArray(combinedHeaders[key])) {
+          if (Array.isArray(val)) {
+            combinedHeaders[key] = combinedHeaders[key].concat(val);
+          } else {
+            combinedHeaders[key].push(val);
           }
+        } else {
+          combinedHeaders[key] = [
+            combinedHeaders[key],
+            ...(Array.isArray(val) ? val : [val]),
+          ];
         }
-      } else {
-        throw new Error(`[Header mismatch] Expected multiple headers with named "${configHeaderKey}" but got only one`);
       }
-    } else if (wasmModuleHeaderValue !== configHeaderValue) {
-      throw new Error(`[Header Value mismatch] Expected: ${configHeaderValue} - Got: ${wasmModuleHeaderValue}`);
+    }
+    configHeaders = combinedHeaders;
+  }
+
+  for (let [configHeaderKey, configHeaderValue] of Object.entries(
+    configHeaders
+  )) {
+    let wasmModuleHeaderValue =
+      wasmModuleHeaders[configHeaderKey.toLowerCase()];
+    if (Array.isArray(configHeaderValue) && configHeaderValue.length === 1) {
+      configHeaderValue = configHeaderValue[0];
+    }
+    if (Array.isArray(configHeaderValue)) {
+      if (!Array.isArray(wasmModuleHeaderValue)) {
+        throw new Error(`[Header Value mismatch] Expected multiple headers for '${configHeaderKey}', but ony got one.`);
+      }
+      if (configHeaderValue.length !== wasmModuleHeaderValue.length) {
+        throw new Error(`[Header Value mismatch] Expected ${configHeaderValue.length} headers for '${configHeaderKey}', but got ${wasmModuleHeaderValue.length}.`);
+      }
+      for (const [idx, configValue] of configHeaderValue.entries()) {
+        if (wasmModuleHeaderValue[idx] !== configValue) {
+          throw new Error(`[Header Value mismatch] Expected '${configValue}' for header item ${idx} of '${configHeaderKey}', but got '${wasmModuleHeaderValue[idx]}'.`);
+        }
+      }
+    }
+    else if (wasmModuleHeaderValue !== configHeaderValue) {
+      throw new Error(
+        `[Header Value mismatch] Expected: '${configHeaderKey}: ${configHeaderValue}' (${configHeaderValue.length}), got '${configHeaderKey}: ${wasmModuleHeaderValue}' (${wasmModuleHeaderValue.length})`
+      );
     }
   }
 };

integration-tests/js-compute/fixtures/app/tests.json

@@ -4367,28 +4367,17 @@
     "downstream_response": {
       "status": 302,
       "headers": [
-        [
-          "Set-Cookie",
-          "test=1; expires=Tue, 06-Dec-2022 12:34:56 GMT; Max-Age=60; Path=/; HttpOnly; Secure"
-        ],
-        [
-          "Set-Cookie",
-          "test_id=1; Max-Age=60; Path=/; expires=Tue, 06-Dec-2022 12:34:56 GMT"
-        ],
-        [
-          "Set-Cookie",
-          "test_id=1; Max-Age=60; Path=/; expires=Tue, 06-Dec-2022 12:34:56 GMT"
-        ],
-        ["Set-Cookie", "test2=2"],
-        ["Set-Cookie", "test3=3"],
-        ["Set-Cookie", "test4=4"],
-        ["Set-Cookie", "test5=5"],
-        ["Set-Cookie", "test6=6"],
-        ["Set-Cookie", "test7=7"],
-        ["Set-Cookie", "test8=8"],
-        ["Set-Cookie", "test9=9"],
-        ["Set-Cookie", "test10=10"],
-        ["Set-Cookie", "test11=11"]
+        ["Set-Cookie", "1=1; Path=/"],
+        ["Set-Cookie", "2=2; Path=/"],
+        ["Set-Cookie", "3=3; Path=/"],
+        ["Set-Cookie", "4=4; Path=/"],
+        ["Set-Cookie", "5=5; Path=/"],
+        ["Set-Cookie", "6=6; Path=/"],
+        ["Set-Cookie", "7=7; Path=/"],
+        ["Set-Cookie", "8=8; Path=/"],
+        ["Set-Cookie", "9=9; Path=/"],
+        ["Set-Cookie", "10=10; Path=/"],
+        ["Set-Cookie", "11=11; Path=/"]
       ]
     }
   },

integration-tests/js-compute/test.js

@@ -149,7 +149,7 @@ for (const chunk of chunks(Object.entries(tests), 100)) {
                         skipped: false
                     };
                 } catch (error) {
-                    throw new Error(`${title} ${error.message}`);
+                    throw new Error(`${title} ${error.message}`, { cause: error });
                 }
             } else {
                 return {