fix: do not split headers by comma

Reverts the core change in 9c7939e Relates to #1031 Fixes #1058 chore: allow v4 tests to run without env var for contributors chore: update debug message for headers chore: update mocha test to use correct multi-valued header syntax
pact-foundation · Jul 8, 2023 · 2e65324 · 2e65324
1 parent bff5a44
commit 2e65324
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/examples/mocha/test/get-dogs.spec.js b/examples/mocha/test/get-dogs.spec.js
@@ -47,23 +47,19 @@ describe('The Dog API', () => {
           method: 'GET',
           path: '/dogs',
           headers: {
-            Accept:
-              'application/problem+json, application/json, text/plain, */*',
-            // Accept: [
-            //   'application/problem+json',
-            //   'application/json',
-            //   'text/plain',
-            //   '*/*',
-            // ],
+            // Accept: 'application/problem+json, application/json, text/plain, */*', // <- fails, must use array syntax ❌
+            Accept: [
+              'application/problem+json',
+              'application/json',
+              'text/plain',
+              '*/*',
+            ],
           },
         },
         willRespondWith: {
           status: 200,
           headers: {
-            'Content-Type': Matchers.term({
-              generate: 'application/json',
-              matcher: 'application/json.*',
-            }),
+            'Content-Type': 'application/json',
           },
           body: EXPECTED_BODY,
         },

diff --git a/src/httpPact/ffi.ts b/src/httpPact/ffi.ts
@@ -93,9 +93,6 @@ export const setHeaders = (
 
     if (Array.isArray(v)) {
       values = v;
-    } else if (typeof v === 'string') {
-      // Allow comma separated items, such as: "application/problem+json, application/json, */*"
-      values = v.split(',').map((h) => h.trim());
     } else {
       values = [v];
     }
@@ -104,7 +101,7 @@ export const setHeaders = (
       case InteractionPart.REQUEST:
         values.forEach((h, i) => {
           logger.debug(
-            `setting header request value for ${h} at index ${i} to ${JSON.stringify(
+            `setting header request value for ${k} at index ${i} to ${JSON.stringify(
               matcherValueOrString(h)
             )}`
           );

diff --git a/src/pact.integration.spec.ts b/src/pact.integration.spec.ts
@@ -4,6 +4,7 @@ import chaiAsPromised from 'chai-as-promised';
 import sinonChai from 'sinon-chai';
 import axios from 'axios';
 import net = require('net');
+
 import { PactV4 } from './v4';
 
 const { expect } = chai;