Fixing the dropping of Content-Type header parameters when verifying …

…pact
kunwardeep · May 2, 2016 · f2c6a22 · f2c6a22
1 parent f27377e
commit f2c6a22
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/PactNet.Tests/Mocks/MockHttpService/Mappers/HttpContentMapperTests.cs b/PactNet.Tests/Mocks/MockHttpService/Mappers/HttpContentMapperTests.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
 using PactNet.Mocks.MockHttpService.Mappers;
 using PactNet.Mocks.MockHttpService.Models;
@@ -33,5 +35,21 @@ public void Convert_WithEmptyContent_ReturnsNull()
 
             Assert.Empty(result.ReadAsStringAsync().Result);
         }
+
+        [Fact]
+        public void Convert_WithContentTypeContainingParameter_ReturnsContentWithContentTypeHeader()
+        {
+            const string contentType = "text/plain";
+            const string content = "test";
+            var httpBodyContent = new HttpBodyContent(content: Encoding.UTF8.GetBytes(content), contentType: contentType + "; version=1", encoding: Encoding.UTF8);
+            IHttpContentMapper mapper = GetSubject();
+
+            HttpContent result = mapper.Convert(httpBodyContent);
+
+            Assert.Equal(contentType, result.Headers.ContentType.MediaType);
+            Assert.Contains(new NameValueHeaderValue("version", "1"), result.Headers.ContentType.Parameters);
+            Assert.Equal("utf-8", result.Headers.ContentType.CharSet);
+            Assert.Equal(content, result.ReadAsStringAsync().Result);
+        }
     }
-}
+}
diff --git a/PactNet/Mocks/MockHttpService/Mappers/HttpContentMapper.cs b/PactNet/Mocks/MockHttpService/Mappers/HttpContentMapper.cs
@@ -1,4 +1,5 @@
 using System.Net.Http;
+using System.Net.Http.Headers;
 using PactNet.Mocks.MockHttpService.Models;
 
 namespace PactNet.Mocks.MockHttpService.Mappers
@@ -12,7 +13,12 @@ public HttpContent Convert(HttpBodyContent from)
                 return null;
             }
 
-            return new StringContent(from.Content, from.Encoding, from.ContentType);
+            var stringContent = new StringContent(from.Content, from.Encoding);
+
+            stringContent.Headers.ContentType = MediaTypeHeaderValue.Parse(from.ContentType);
+            stringContent.Headers.ContentType.CharSet = from.Encoding.WebName;
+
+            return stringContent;
         }
     }
 }