1.5.30

Bumps [System.Linq.Dynamic.Core](https://github.com/zzzprojects/System.Linq.Dynamic.Core) from 1.2.23 to 1.3.0.
- [Release notes](https://github.com/zzzprojects/System.Linq.Dynamic.Core/releases)
- [Changelog](https://github.com/zzzprojects/System.Linq.Dynamic.Core/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zzzprojects/System.Linq.Dynamic.Core/compare/v1.2.23...v1.3.0)

---
updated-dependencies:
- dependency-name: System.Linq.Dynamic.Core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.5.30 (28 June 2023)
+- [#959](https://github.com/WireMock-Net/WireMock.Net/pull/959) - Fixed logic for FluentAssertions WithHeader [bug] contributed by [StefH](https://github.com/StefH)
+- [#961](https://github.com/WireMock-Net/WireMock.Net/pull/961) - Add unit-test for Param MatcherModel LinqMatcher [test] contributed by [StefH](https://github.com/StefH)
+- [#962](https://github.com/WireMock-Net/WireMock.Net/pull/962) - Bump System.Linq.Dynamic.Core from 1.2.23 to 1.3.0 in /examples/WireMock.Net.Console.Net472.Classic [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#963](https://github.com/WireMock-Net/WireMock.Net/pull/963) - Bump System.Linq.Dynamic.Core from 1.2.23 to 1.3.0 in /examples/WireMock.Net.StandAlone.Net461 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#958](https://github.com/WireMock-Net/WireMock.Net/issues/958) - [FluentAssertions] Should().HaveReceivedACall().WithHeader() only checks the first header with the matching key. [bug]
+
 # 1.5.29 (22 June 2023)
 - [#954](https://github.com/WireMock-Net/WireMock.Net/pull/954) - Support setting WireMockServerSettings via Environment [feature] contributed by [StefH](https://github.com/StefH)
 - [#955](https://github.com/WireMock-Net/WireMock.Net/pull/955) - Fix some SonarCloud issues [refactor] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.29</VersionPrefix>
+        <VersionPrefix>1.5.30</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

Generate-ReleaseNotes.cmd

@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.5.29
+SET version=1.5.30
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,6 +1,8 @@
-# 1.5.29 (22 June 2023)
-- #954 Support setting WireMockServerSettings via Environment [feature]
-- #955 Fix some SonarCloud issues [refactor]
-- #953 How to use environment variable [feature]
+# 1.5.30 (28 June 2023)
+- #959 Fixed logic for FluentAssertions WithHeader [bug]
+- #961 Add unit-test for Param MatcherModel LinqMatcher [test]
+- #962 Bump System.Linq.Dynamic.Core from 1.2.23 to 1.3.0 in /examples/WireMock.Net.Console.Net472.Classic [dependencies]
+- #963 Bump System.Linq.Dynamic.Core from 1.2.23 to 1.3.0 in /examples/WireMock.Net.StandAlone.Net461 [dependencies]
+- #958 [FluentAssertions] Should().HaveReceivedACall().WithHeader() only checks the first header with the matching key. [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

examples/WireMock.Net.Console.Net472.Classic/packages.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net472" />
   <package id="Fare" version="2.2.1" targetFramework="net472" />
@@ -138,7 +138,7 @@
   <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net472" />
   <package id="System.IdentityModel.Tokens.Jwt" version="6.25.0" targetFramework="net472" />
   <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net472" />
-  <package id="System.Linq.Dynamic.Core" version="1.2.23" targetFramework="net472" />
+  <package id="System.Linq.Dynamic.Core" version="1.3.0" targetFramework="net472" />
   <package id="System.Memory" version="4.5.4" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />

examples/WireMock.Net.StandAlone.Net461/packages.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Handlebars.Net" version="2.1.2" targetFramework="net461" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net461" />
@@ -68,7 +68,7 @@
   <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.5.1" targetFramework="net461" />
   <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net461" />
-  <package id="System.Linq.Dynamic.Core" version="1.2.23" targetFramework="net461" />
+  <package id="System.Linq.Dynamic.Core" version="1.3.0" targetFramework="net461" />
   <package id="System.Memory" version="4.5.4" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
   <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" />

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs

@@ -149,15 +149,15 @@ public class WireMockAssertions
 
         using (new AssertionScope($"header \"{expectedKey}\" from requests sent with value(s)"))
         {
-            var headerValues = _headers.First(h => h.Key == expectedKey).Value;
+            var matchingHeaderValues = _headers.Where(h => h.Key == expectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
 
             if (expectedValues.Length == 1)
             {
-                headerValues.Should().Contain(expectedValues.First(), because, becauseArgs);
+                matchingHeaderValues.Should().Contain(expectedValues.First(), because, becauseArgs);
             }
             else
             {
-                var trimmedHeaderValues = string.Join(",", headerValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
+                var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
                 foreach (var expectedValue in expectedValues)
                 {
                     trimmedHeaderValues.Should().Contain(expectedValue, because, becauseArgs);

test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs

@@ -210,6 +210,36 @@ public class WireMockAssertionsTests : IDisposable
             .Be($"{string.Join(NewLine, missingValue1Message, missingValue2Message)}{NewLine}");
     }
 
+    [Fact]
+    public async Task HaveReceivedACall_WithHeader_ShouldCheckAllRequests()
+    {
+        // Arrange
+        using var server = WireMockServer.Start();
+        using var client = server.CreateClient();
+
+        // Act 1
+        await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/")
+        {
+            Headers =
+            {
+                Authorization = new AuthenticationHeaderValue("Bearer", "invalidToken")
+            }
+        });
+
+        // Act 2
+        await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/")
+        {
+            Headers =
+            {
+                Authorization = new AuthenticationHeaderValue("Bearer", "validToken")
+            }
+        });
+
+        // Assert
+        server.Should().HaveReceivedACall().WithHeader("Authorization", "Bearer invalidToken");
+        server.Should().HaveReceivedACall().WithHeader("Authorization", "Bearer validToken");
+    }
+
     [Fact]
     public async Task HaveReceivedACall_AtUrl_WhenACallWasMadeToUrl_Should_BeOK()
     {

test/WireMock.Net.Tests/MappingBuilderTests.GetMappings.verified.txt

@@ -14,6 +14,17 @@
       },
       Methods: [
         GET
+      ],
+      Params: [
+        {
+          Name: test,
+          Matchers: [
+            {
+              Name: LinqMatcher,
+              Pattern: it.Length < 10
+            }
+          ]
+        }
       ]
     },
     Response: {

test/WireMock.Net.Tests/MappingBuilderTests.ToJson.verified.txt

@@ -14,6 +14,17 @@
       },
       Methods: [
         GET
+      ],
+      Params: [
+        {
+          Name: test,
+          Matchers: [
+            {
+              Name: LinqMatcher,
+              Pattern: it.Length < 10
+            }
+          ]
+        }
       ]
     },
     Response: {

test/WireMock.Net.Tests/MappingBuilderTests.cs

@@ -6,6 +6,7 @@ using VerifyTests;
 using VerifyXunit;
 using WireMock.Handlers;
 using WireMock.Logging;
+using WireMock.Matchers;
 using WireMock.Net.Tests.VerifyExtensions;
 using WireMock.Owin;
 using WireMock.RequestBuilders;
@@ -65,6 +66,7 @@ public class MappingBuilderTests
 
         _sut.Given(Request.Create()
             .WithPath("/foo")
+            .WithParam("test", new LinqMatcher("it.Length < 10"))
             .UsingGet()
         )
         .WithGuid(MappingGuid)

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -25,7 +25,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <Compile Remove="Util\JsonUtilsTests.cs" />
+        <Compile Remove="Util\JsonUtilsTests.cs" />
     </ItemGroup>
 
     <ItemGroup>
@@ -63,8 +63,6 @@
         </PackageReference>
 
         <PackageReference Include="Moq" Version="4.17.2" />
-
-        <!--<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.1" />-->
         <PackageReference Include="System.Threading" Version="4.3.0" />
         <PackageReference Include="RestEase" Version="1.5.7" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
@@ -104,10 +102,10 @@
 
     <ItemGroup>
         <None Update="OpenApiParser\*.json">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
         <None Update="OpenApiParser\*.yml">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
         <None Update="responsebody.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>