From be070af7ad1d033a35e68cb0206b4253f7179ef4 Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Mon, 21 Feb 2022 20:41:51 +0100 Subject: [PATCH] BodyAsFile should use BodyAsFileIsCached value (#729) * BodyAsFile should use BodyAsFileIsCached value * . --- .../WireMock.Net.Console.NET5.csproj | 1 + .../__admin/mappings/BodyAsFileExample.json | 4 +++- .../__admin/mappings/BodyAsFileExample2.json | 24 +++++++++++++++++++ .../Server/WireMockServer.Admin.cs | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 examples/WireMock.Net.Console.NET5/__admin/mappings/BodyAsFileExample2.json diff --git a/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj b/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj index c29d2ac3..593c3c69 100644 --- a/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj +++ b/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj @@ -23,6 +23,7 @@ + diff --git a/examples/WireMock.Net.Console.NET5/__admin/mappings/BodyAsFileExample.json b/examples/WireMock.Net.Console.NET5/__admin/mappings/BodyAsFileExample.json index 633db99e..7ec87a33 100644 --- a/examples/WireMock.Net.Console.NET5/__admin/mappings/BodyAsFileExample.json +++ b/examples/WireMock.Net.Console.NET5/__admin/mappings/BodyAsFileExample.json @@ -1,4 +1,5 @@ { + "Guid": "1234567A-940e-4b86-a1f4-4f0fc7be8b8b", "Request": { "Path": { "Matchers": [ @@ -15,8 +16,9 @@ }, "Response": { "StatusCode": 200, - "Headers": {"Content-Type": "application/xml"}, + "Headers": { "Content-Type": "application/xml" }, "BodyAsFile": "MyXmlResponse.xml", + "BodyAsFileIsCached": false, "UseTransformer": false } } \ No newline at end of file diff --git a/examples/WireMock.Net.Console.NET5/__admin/mappings/BodyAsFileExample2.json b/examples/WireMock.Net.Console.NET5/__admin/mappings/BodyAsFileExample2.json new file mode 100644 index 00000000..25ec4832 --- /dev/null +++ b/examples/WireMock.Net.Console.NET5/__admin/mappings/BodyAsFileExample2.json @@ -0,0 +1,24 @@ +{ + "Guid": "1234567B-940e-4b86-a1f4-4f0fc7be8b8b", + "Request": { + "Path": { + "Matchers": [ + { + "Name": "WildcardMatcher", + "Pattern": "/bodyasfilexmltest2", + "IgnoreCase": false + } + ] + }, + "Methods": [ + "get" + ] + }, + "Response": { + "StatusCode": 200, + "Headers": { "Content-Type": "application/xml" }, + "BodyAsFile": "MyXmlResponse.xml", + "BodyAsFileIsCached": true, + "UseTransformer": false + } +} \ No newline at end of file diff --git a/src/WireMock.Net/Server/WireMockServer.Admin.cs b/src/WireMock.Net/Server/WireMockServer.Admin.cs index 38341813..eef79485 100644 --- a/src/WireMock.Net/Server/WireMockServer.Admin.cs +++ b/src/WireMock.Net/Server/WireMockServer.Admin.cs @@ -868,7 +868,7 @@ namespace WireMock.Server } else if (responseModel.BodyAsFile != null) { - responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile); + responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile, responseModel.BodyAsFileIsCached == true); } if (responseModel.Fault != null && Enum.TryParse(responseModel.Fault.Type, out FaultType faultType))