huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge issue

This commit is contained in:
Hao Kung 2015-09-02 17:49:18 -07:00
parent 76dceaef76
commit 77d9b41e48
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs
View File

@ -97,7 +97,6 @@ namespace Microsoft.AspNet.Mvc.ActionResults
httpContext.RequestServices = services.Object; httpContext.RequestServices = services.Object;
var optionsAccessor = new TestOptionsManager<MvcOptions>(); var optionsAccessor = new TestOptionsManager<MvcOptions>();
var optionsAccessor = new MockMvcOptionsAccessor();
optionsAccessor.Value.OutputFormatters.Add(new StringOutputFormatter()); optionsAccessor.Value.OutputFormatters.Add(new StringOutputFormatter());
optionsAccessor.Value.OutputFormatters.Add(new JsonOutputFormatter()); optionsAccessor.Value.OutputFormatters.Add(new JsonOutputFormatter());
services.Setup(p => p.GetService(typeof(IOptions<MvcOptions>))) services.Setup(p => p.GetService(typeof(IOptions<MvcOptions>)))