Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't return empty dictionary object for response headers in JSON mapping #424

Merged
merged 1 commit into from Feb 22, 2020
Merged

Don't return empty dictionary object for response headers in JSON mapping #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.NETCore2.csproj
View file
Open in desktop
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
<StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
<AssemblyName>WireMock.Net.WebApplication</AssemblyName>
Expand Down
14 changes: 7 additions & 7 deletions src/WireMock.Net/Serialization/MappingConverter.cs
View file
Open in desktop
Expand Up @@ -124,11 +124,17 @@ public MappingModel ToMappingModel(IMapping mapping)
mappingModel.Response.WebProxy = null;
mappingModel.Response.BodyDestination = response.ResponseMessage.BodyDestination;
mappingModel.Response.StatusCode = response.ResponseMessage.StatusCode;
mappingModel.Response.Headers = MapHeaders(response.ResponseMessage.Headers);

if (response.ResponseMessage.Headers != null && response.ResponseMessage.Headers.Count > 0)
{
mappingModel.Response.Headers = MapHeaders(response.ResponseMessage.Headers);
}

if (response.UseTransformer)
{
mappingModel.Response.UseTransformer = response.UseTransformer;
}

if (response.UseTransformerForBodyAsFile)
{
mappingModel.Response.UseTransformerForBodyAsFile = response.UseTransformerForBodyAsFile;
Expand Down Expand Up @@ -197,12 +203,6 @@ private static WebProxyModel MapWebProxy(IWebProxySettings settings)
private static IDictionary<string, object> MapHeaders(IDictionary<string, WireMockList<string>> dictionary)
{
var newDictionary = new Dictionary<string, object>();

if (dictionary == null || dictionary.Count == 0)
{
return newDictionary;
}

foreach (var entry in dictionary)
{
object value = entry.Value.Count == 1 ? (object)entry.Value.ToString() : entry.Value;
Expand Down
2 changes: 1 addition & 1 deletion test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs
View file
Open in desktop
@@ -1,6 +1,5 @@
using System;
using FluentAssertions;
using Moq;
using WireMock.RequestBuilders;
using WireMock.ResponseBuilders;
using WireMock.Serialization;
Expand Down Expand Up @@ -36,6 +35,7 @@ public void ToMappingModel()
model.Priority.Should().BeNull();
model.Response.BodyAsJsonIndented.Should().BeNull();
model.Response.UseTransformer.Should().BeNull();
model.Response.Headers.Should().BeNull();
}

[Fact]
Expand Down