Fixed for 'Response BodyAsJson with JArray does not work' (#722)

WireMock-Net · Feb 9, 2022 · f919a03 · f919a03
1 parent bb90658
commit f919a03
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -4,11 +4,9 @@
         <Description>Commonly used models, enumerations and types.</Description>
         <AssemblyTitle>WireMock.Net.Abstractions</AssemblyTitle>
         <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net45;netstandard1.0;netstandard2.0;netstandard2.1</TargetFrameworks>
-
+        <TargetFrameworks>net45;net451;netstandard1.0;netstandard2.0;netstandard2.1</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591;8603</NoWarn>
-
         <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
         <PackageId>WireMock.Net.Abstractions</PackageId>
         <PackageTags>wiremock;wiremock.org;interfaces;models;classes;enumerations;types</PackageTags>

diff --git a/src/WireMock.Net/Transformers/Transformer.cs b/src/WireMock.Net/Transformers/Transformer.cs
@@ -124,6 +124,11 @@ private static IBodyData TransformBodyAsJson(ITransformerContext handlebarsConte
                     WalkNode(handlebarsContext, options, jToken, model);
                     break;
 
+                case JArray bodyAsJArray:
+                    jToken = bodyAsJArray.DeepClone();
+                    WalkNode(handlebarsContext, options, jToken, model);
+                    break;
+
                 case Array bodyAsArray:
                     jToken = JArray.FromObject(bodyAsArray);
                     WalkNode(handlebarsContext, options, jToken, model);

diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Moq;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using NFluent;
 using WireMock.Handlers;
 using WireMock.Models;
@@ -385,6 +386,47 @@ public async Task Response_ProvideResponse_Transformer_WithBodyAsJson_ResultAsOb
             Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
         }
 
+        [Theory]
+        [InlineData(TransformerType.Handlebars)]
+        [InlineData(TransformerType.Scriban)]
+        [InlineData(TransformerType.ScribanDotLiquid)]
+        public async Task Response_ProvideResponse_Transformer_ResultAsArray(TransformerType transformerType)
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "GET", ClientIp);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new [] { new { x = "test" }})
+                .WithTransformer(transformerType);
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
+
+            // Assert
+            JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson).Should().Be("[{\"x\":\"test\"}]");
+        }
+
+        [Theory]
+        [InlineData(TransformerType.Handlebars)]
+        [InlineData(TransformerType.Scriban)]
+        [InlineData(TransformerType.ScribanDotLiquid)]
+        public async Task Response_ProvideResponse_Transformer_ResultAsJArray(TransformerType transformerType)
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "GET", ClientIp);
+
+            var array = JArray.Parse("[{\"x\":\"test\"}]");
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(array)
+                .WithTransformer(transformerType);
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
+
+            // Assert
+            JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson).Should().Be("[{\"x\":\"test\"}]");
+        }
+
         //[Theory]
         //[InlineData(TransformerType.Handlebars, "a")]
         //[InlineData(TransformerType.Handlebars, "42")]