From 72014794390806cd436028ecc34b0d4b024a40af Mon Sep 17 00:00:00 2001 From: Ronald Wildenberg Date: Mon, 22 Jul 2019 18:33:40 +0200 Subject: [PATCH] Fixed bug 301 by not setting BodyAsFile to null after first use (#302) * Fixed bug 301 by not setting BodyAsFile to null after first use * Added extra unit test * 1.0.24.0 --- Directory.Build.props | 2 +- GitHubReleaseNotes.txt | 2 +- src/WireMock.Net/ResponseBuilders/Response.cs | 1 - .../ResponseBuilders/ResponseWithBodyFromFileTests.cs | 8 ++++++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 952830bb..cd4a2184 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ - 1.0.23 + 1.0.24 diff --git a/GitHubReleaseNotes.txt b/GitHubReleaseNotes.txt index 3a6d2a8d..554d7463 100644 --- a/GitHubReleaseNotes.txt +++ b/GitHubReleaseNotes.txt @@ -1,3 +1,3 @@ https://github.com/StefH/GitHubReleaseNotes -GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.23.0 \ No newline at end of file +GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.24.0 \ No newline at end of file diff --git a/src/WireMock.Net/ResponseBuilders/Response.cs b/src/WireMock.Net/ResponseBuilders/Response.cs index 2ca85c39..4f09f361 100644 --- a/src/WireMock.Net/ResponseBuilders/Response.cs +++ b/src/WireMock.Net/ResponseBuilders/Response.cs @@ -419,7 +419,6 @@ namespace WireMock.ResponseBuilders if (!UseTransformer && ResponseMessage.BodyData?.BodyAsFileIsCached == true) { ResponseMessage.BodyData.BodyAsBytes = settings.FileSystemHandler.ReadResponseBodyAsFile(ResponseMessage.BodyData.BodyAsFile); - ResponseMessage.BodyData.BodyAsFile = null; } return ResponseMessage; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs index 4d316b55..b116053e 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs @@ -36,10 +36,14 @@ namespace WireMock.Net.Tests.ResponseBuilders ); // Act - var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); + var response1 = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); + var response2 = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); + var response3 = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); // Assert - response.Should().Contain("world"); + response1.Should().Contain("world"); + response2.Should().Contain("world"); + response3.Should().Contain("world"); } } } \ No newline at end of file