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

merge netstandard into main (#26)

Browse Source 
* #23

* #23 "Newtonsoft.Json" Version="10.0.2"

* owin

* AspNetCore

* Fix appveyor build

* fix start/stop in untitests
This commit is contained in:
Stef Heyenrath
2017-04-26 21:28:12 +02:00
committed by GitHub
parent 0f8f9c508f
commit 453cef90e5
106 changed files with 17753 additions and 24342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/WireMock.Net/Server/FluentMockServer.Admin.cs
View File

@@ -122,8 +122,8 @@ namespace WireMock.Server
{
var model = new SettingsModel
{
AllowPartialMapping = _allowPartialMapping,
GlobalProcessingDelay = _requestProcessingDelay?.Milliseconds
AllowPartialMapping = _options.AllowPartialMapping,
GlobalProcessingDelay = _options.RequestProcessingDelay?.Milliseconds
};
return ToJson(model);
@@ -134,10 +134,10 @@ namespace WireMock.Server
var settings = JsonConvert.DeserializeObject<SettingsModel>(requestMessage.Body);
if (settings.AllowPartialMapping != null)
_allowPartialMapping = settings.AllowPartialMapping.Value;
_options.AllowPartialMapping = settings.AllowPartialMapping.Value;
if (settings.GlobalProcessingDelay != null)
_requestProcessingDelay = TimeSpan.FromMilliseconds(settings.GlobalProcessingDelay.Value);
_options.RequestProcessingDelay = TimeSpan.FromMilliseconds(settings.GlobalProcessingDelay.Value);
return new ResponseMessage { Body = "Settings updated" };
}