-
-
Notifications
You must be signed in to change notification settings - Fork 213
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into stef-protobuf
- Loading branch information
Showing
13 changed files
with
101 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| rem https://github.com/StefH/GitHubReleaseNotes | ||
|
|
||
| SET version=1.5.46 | ||
| SET version=1.5.47 | ||
|
|
||
| GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN% | ||
| GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate example --version %version% --token %GH_TOKEN% | ||
|
|
||
| GitHubReleaseNotes --output PackageReleaseNotes.txt --skip-empty-releases --exclude-labels question invalid doc duplicate --template PackageReleaseNotes.template --version %version% --token %GH_TOKEN% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| # 1.5.46 (23 December 2023) | ||
| - #1044 WireMockServerSettingsParser [refactor] | ||
| - #1046 Change FindRequestByMappingGuidAsync to return a collection of entries | ||
| # 1.5.47 (25 January 2024) | ||
| - #1049 Add WithoutHeader to WireMock.FluentAssertions [feature] | ||
| - #1053 [Snyk] Security upgrade Microsoft.IdentityModel.Protocols.OpenIdConnect from 6.12.2 to 6.34.0 [security] | ||
| - #1055 Bump System.IdentityModel.Tokens.Jwt from 6.25.0 to 6.34.0 in /examples/WireMock.Net.Console.Net472.Classic [example] | ||
| - #1057 Pin the version from Testcontainers to 3.7.0 in WireMock.Net.Testcontainers [bug] | ||
| - #1048 WithoutHeader fluent assertion [feature] | ||
| - #1054 WireMock.Net 1.5.46 is incompatible with TestContainers 3.7.0 (issue 1) [bug] | ||
| - #1059 WireMock.Net 1.5.46 is incompatible with TestContainers 3.7.0 (issue 2) [bug] | ||
|
|
||
| The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| #if NET6_0_OR_GREATER | ||
| using System.Threading.Tasks; | ||
| using FluentAssertions; | ||
| using FluentAssertions.Execution; | ||
| using WireMock.Net.Testcontainers; | ||
| using Xunit; | ||
|
|
||
| namespace WireMock.Net.Tests.Testcontainers; | ||
|
|
||
| public class TestcontainersTests | ||
| { | ||
| [Fact] | ||
| public async Task WireMockContainer_Build_and_StartAsync_and_StopAsync() | ||
| { | ||
| // Act | ||
| var wireMockContainer = new WireMockContainerBuilder() | ||
| .WithAutoRemove(true) | ||
| .WithCleanUp(true) | ||
| .Build(); | ||
|
|
||
| try | ||
| { | ||
| await wireMockContainer.StartAsync().ConfigureAwait(false); | ||
|
|
||
| // Assert | ||
| using (new AssertionScope()) | ||
| { | ||
| var url = wireMockContainer.GetPublicUrl(); | ||
| url.Should().NotBeNullOrWhiteSpace(); | ||
|
|
||
| var adminClient = wireMockContainer.CreateWireMockAdminClient(); | ||
|
|
||
| var settings = await adminClient.GetSettingsAsync(); | ||
| settings.Should().NotBeNull(); | ||
| } | ||
| } | ||
| finally | ||
| { | ||
| await wireMockContainer.StopAsync(); | ||
| } | ||
| } | ||
| } | ||
| #endif |
Oops, something went wrong.