starred/WireMock.Net
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-03-30 14:22:20 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Fix #110

Browse Source
This commit is contained in:
Stef Heyenrath
2018-03-20 21:06:58 +01:00
parent a4a9f2c862
commit a3c853b4ad
13 changed files with 57 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -1,3 +1,10 @@
# 1.0.3.11 (20 March 2018)
- [#110](https://github.com/WireMock-Net/WireMock.Net/issues/110) - Fix: remove `Func[]` from MappingModel
Commits: a4a9f2c862...a4a9f2c862
# 1.0.3.10 (17 March 2018) # 1.0.3.10 (17 March 2018)
- [#109](https://github.com/WireMock-Net/WireMock.Net/issues/109) - Issue: When proxying, MimeType is wrong for StringContent - [#109](https://github.com/WireMock-Net/WireMock.Net/issues/109) - Issue: When proxying, MimeType is wrong for StringContent

2
GitReleaseNotes.txt
View File

@@ -1,5 +1,5 @@
https://github.com/GitTools/GitReleaseNotes https://github.com/GitTools/GitReleaseNotes
GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.3.10 GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.3.11
GitReleaseNotes.exe . /OutputFile CHANGELOG.md /allTags GitReleaseNotes.exe . /OutputFile CHANGELOG.md /allTags

2
src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Description>Lightweight StandAlone Http Mocking Server for .Net.</Description> <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
<AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle> <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
<Version>1.0.3.10</Version> <Version>1.0.3.11</Version>
<Authors>Stef Heyenrath</Authors> <Authors>Stef Heyenrath</Authors>
<TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks> <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>

25
src/WireMock.Net/Admin/Mappings/BodyModel.cs
View File

@@ -8,25 +8,16 @@
/// <summary> /// <summary>
/// Gets or sets the matcher. /// Gets or sets the matcher.
/// </summary> /// </summary>
/// <value>
/// The matcher.
/// </value>
public MatcherModel Matcher { get; set; } public MatcherModel Matcher { get; set; }
/// <summary> ///// <summary>
/// Gets or sets the function. ///// Gets or sets the function.
/// </summary> ///// </summary>
/// <value> //public string Func { get; set; }
/// The function.
/// </value>
public string Func { get; set; }
/// <summary> ///// <summary>
/// Gets or sets the data function. ///// Gets or sets the data function.
/// </summary> ///// </summary>
/// <value> //public string DataFunc { get; set; }
/// The data function.
/// </value>
public string DataFunc { get; set; }
} }
} }

14
src/WireMock.Net/Admin/Mappings/ClientIPModel.cs
View File

@@ -8,17 +8,11 @@
/// <summary> /// <summary>
/// Gets or sets the matchers. /// Gets or sets the matchers.
/// </summary> /// </summary>
/// <value>
/// The matchers.
/// </value>
public MatcherModel[] Matchers { get; set; } public MatcherModel[] Matchers { get; set; }
/// <summary> ///// <summary>
/// Gets or sets the functions. ///// Gets or sets the functions.
/// </summary> ///// </summary>
/// <value> //public string[] Funcs { get; set; }
/// The functions.
/// </value>
public string[] Funcs { get; set; }
} }
} }

17
src/WireMock.Net/Admin/Mappings/CookieModel.cs
View File

@@ -10,25 +10,16 @@ namespace WireMock.Admin.Mappings
/// <summary> /// <summary>
/// Gets or sets the name. /// Gets or sets the name.
/// </summary> /// </summary>
/// <value>
/// The name.
/// </value>
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Gets or sets the matchers. /// Gets or sets the matchers.
/// </summary> /// </summary>
/// <value>
/// The matchers.
/// </value>
public IList<MatcherModel> Matchers { get; set; } public IList<MatcherModel> Matchers { get; set; }
/// <summary> ///// <summary>
/// Gets or sets the functions. ///// Gets or sets the functions.
/// </summary> ///// </summary>
/// <value> //public string[] Funcs { get; set; }
/// The functions.
/// </value>
public string[] Funcs { get; set; }
} }
} }

17
src/WireMock.Net/Admin/Mappings/HeaderModel.cs
View File

@@ -10,25 +10,16 @@ namespace WireMock.Admin.Mappings
/// <summary> /// <summary>
/// Gets or sets the name. /// Gets or sets the name.
/// </summary> /// </summary>
/// <value>
/// The name.
/// </value>
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Gets or sets the matchers. /// Gets or sets the matchers.
/// </summary> /// </summary>
/// <value>
/// The matchers.
/// </value>
public IList<MatcherModel> Matchers { get; set; } public IList<MatcherModel> Matchers { get; set; }
/// <summary> ///// <summary>
/// Gets or sets the functions. ///// Gets or sets the functions.
/// </summary> ///// </summary>
/// <value> //public string[] Funcs { get; set; }
/// The functions.
/// </value>
public string[] Funcs { get; set; }
} }
} }

17
src/WireMock.Net/Admin/Mappings/ParamModel.cs
View File

@@ -10,25 +10,16 @@ namespace WireMock.Admin.Mappings
/// <summary> /// <summary>
/// Gets or sets the name. /// Gets or sets the name.
/// </summary> /// </summary>
/// <value>
/// The name.
/// </value>
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Gets or sets the values. /// Gets or sets the values.
/// </summary> /// </summary>
/// <value>
/// The values.
/// </value>
public IList<string> Values { get; set; } public IList<string> Values { get; set; }
/// <summary> ///// <summary>
/// Gets or sets the functions. ///// Gets or sets the functions.
/// </summary> ///// </summary>
/// <value> //public string[] Funcs { get; set; }
/// The functions.
/// </value>
public string[] Funcs { get; set; }
} }
} }

14
src/WireMock.Net/Admin/Mappings/PathModel.cs
View File

@@ -8,17 +8,11 @@
/// <summary> /// <summary>
/// Gets or sets the matchers. /// Gets or sets the matchers.
/// </summary> /// </summary>
/// <value>
/// The matchers.
/// </value>
public MatcherModel[] Matchers { get; set; } public MatcherModel[] Matchers { get; set; }
/// <summary> ///// <summary>
/// Gets or sets the functions. ///// Gets or sets the functions.
/// </summary> ///// </summary>
/// <value> //public string[] Funcs { get; set; }
/// The functions.
/// </value>
public string[] Funcs { get; set; }
} }
} }

21
src/WireMock.Net/Admin/Mappings/RequestModel.cs
View File

@@ -10,25 +10,16 @@ namespace WireMock.Admin.Mappings
/// <summary> /// <summary>
/// Gets or sets the ClientIP. (Can be a string or a ClientIPModel) /// Gets or sets the ClientIP. (Can be a string or a ClientIPModel)
/// </summary> /// </summary>
/// <value>
/// The ClientIP.
/// </value>
public object ClientIP { get; set; } public object ClientIP { get; set; }
/// <summary> /// <summary>
/// Gets or sets the Path. (Can be a string or a PathModel) /// Gets or sets the Path. (Can be a string or a PathModel)
/// </summary> /// </summary>
/// <value>
/// The Path.
/// </value>
public object Path { get; set; } public object Path { get; set; }
/// <summary> /// <summary>
/// Gets or sets the Url. (Can be a string or a UrlModel) /// Gets or sets the Url. (Can be a string or a UrlModel)
/// </summary> /// </summary>
/// <value>
/// The URL.
/// </value>
public object Url { get; set; } public object Url { get; set; }
/// <summary> /// <summary>
@@ -39,33 +30,21 @@ namespace WireMock.Admin.Mappings
/// <summary> /// <summary>
/// Gets or sets the Headers. /// Gets or sets the Headers.
/// </summary> /// </summary>
/// <value>
/// The Headers.
/// </value>
public IList<HeaderModel> Headers { get; set; } public IList<HeaderModel> Headers { get; set; }
/// <summary> /// <summary>
/// Gets or sets the Cookies. /// Gets or sets the Cookies.
/// </summary> /// </summary>
/// <value>
/// The Cookies.
/// </value>
public IList<CookieModel> Cookies { get; set; } public IList<CookieModel> Cookies { get; set; }
/// <summary> /// <summary>
/// Gets or sets the Params. /// Gets or sets the Params.
/// </summary> /// </summary>
/// <value>
/// The Headers.
/// </value>
public IList<ParamModel> Params { get; set; } public IList<ParamModel> Params { get; set; }
/// <summary> /// <summary>
/// Gets or sets the body. /// Gets or sets the body.
/// </summary> /// </summary>
/// <value>
/// The body.
/// </value>
public BodyModel Body { get; set; } public BodyModel Body { get; set; }
} }
} }

14
src/WireMock.Net/Admin/Mappings/UrlModel.cs
View File

@@ -8,17 +8,11 @@
/// <summary> /// <summary>
/// Gets or sets the matchers. /// Gets or sets the matchers.
/// </summary> /// </summary>
/// <value>
/// The matchers.
/// </value>
public MatcherModel[] Matchers { get; set; } public MatcherModel[] Matchers { get; set; }
/// <summary> ///// <summary>
/// Gets or sets the functions. ///// Gets or sets the functions.
/// </summary> ///// </summary>
/// <value> //public string[] Funcs { get; set; }
/// The functions.
/// </value>
public string[] Funcs { get; set; }
} }
} }

30
src/WireMock.Net/Serialization/MappingConverter.cs
View File

@@ -38,20 +38,20 @@ namespace WireMock.Serialization
{ {
ClientIP = clientIPMatchers != null && clientIPMatchers.Any() ? new ClientIPModel ClientIP = clientIPMatchers != null && clientIPMatchers.Any() ? new ClientIPModel
{ {
Matchers = MatcherMapper.Map(clientIPMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers)), Matchers = MatcherMapper.Map(clientIPMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
Funcs = Map(clientIPMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs)) //Funcs = Map(clientIPMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
} : null, } : null,
Path = pathMatchers != null && pathMatchers.Any() ? new PathModel Path = pathMatchers != null && pathMatchers.Any() ? new PathModel
{ {
Matchers = MatcherMapper.Map(pathMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers)), Matchers = MatcherMapper.Map(pathMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
Funcs = Map(pathMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs)) //Funcs = Map(pathMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
} : null, } : null,
Url = urlMatchers != null && urlMatchers.Any() ? new UrlModel Url = urlMatchers != null && urlMatchers.Any() ? new UrlModel
{ {
Matchers = MatcherMapper.Map(urlMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers)), Matchers = MatcherMapper.Map(urlMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
Funcs = Map(urlMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs)) //Funcs = Map(urlMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
} : null, } : null,
Methods = methodMatcher?.Methods, Methods = methodMatcher?.Methods,
@@ -59,29 +59,29 @@ namespace WireMock.Serialization
Headers = headerMatchers != null && headerMatchers.Any() ? headerMatchers.Select(hm => new HeaderModel Headers = headerMatchers != null && headerMatchers.Any() ? headerMatchers.Select(hm => new HeaderModel
{ {
Name = hm.Name, Name = hm.Name,
Matchers = MatcherMapper.Map(hm.Matchers), Matchers = MatcherMapper.Map(hm.Matchers)
Funcs = Map(hm.Funcs) //Funcs = Map(hm.Funcs)
}).ToList() : null, }).ToList() : null,
Cookies = cookieMatchers != null && cookieMatchers.Any() ? cookieMatchers.Select(cm => new CookieModel Cookies = cookieMatchers != null && cookieMatchers.Any() ? cookieMatchers.Select(cm => new CookieModel
{ {
Name = cm.Name, Name = cm.Name,
Matchers = MatcherMapper.Map(cm.Matchers), Matchers = MatcherMapper.Map(cm.Matchers)
Funcs = Map(cm.Funcs) //Funcs = Map(cm.Funcs)
}).ToList() : null, }).ToList() : null,
Params = paramsMatchers != null && paramsMatchers.Any() ? paramsMatchers.Select(pm => new ParamModel Params = paramsMatchers != null && paramsMatchers.Any() ? paramsMatchers.Select(pm => new ParamModel
{ {
Name = pm.Key, Name = pm.Key,
Values = pm.Values?.ToList(), Values = pm.Values?.ToList()
Funcs = Map(pm.Funcs) //Funcs = Map(pm.Funcs)
}).ToList() : null, }).ToList() : null,
Body = methodMatcher?.Methods != null && methodMatcher.Methods.Any(m => m == "get") ? null : new BodyModel Body = methodMatcher?.Methods != null && methodMatcher.Methods.Any(m => m == "get") ? null : new BodyModel
{ {
Matcher = bodyMatcher != null ? MatcherMapper.Map(bodyMatcher.Matcher) : null, Matcher = bodyMatcher != null ? MatcherMapper.Map(bodyMatcher.Matcher) : null
Func = bodyMatcher != null ? Map(bodyMatcher.Func) : null, //Func = bodyMatcher != null ? Map(bodyMatcher.Func) : null,
DataFunc = bodyMatcher != null ? Map(bodyMatcher.DataFunc) : null //DataFunc = bodyMatcher != null ? Map(bodyMatcher.DataFunc) : null
} }
}, },
Response = new ResponseModel Response = new ResponseModel

2
src/WireMock.Net/WireMock.Net.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description> <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
<AssemblyTitle>WireMock.Net</AssemblyTitle> <AssemblyTitle>WireMock.Net</AssemblyTitle>
<Version>1.0.3.10</Version> <Version>1.0.3.11</Version>
<Authors>Stef Heyenrath</Authors> <Authors>Stef Heyenrath</Authors>
<TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks> <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>