Merge branch 'merge/release/2.2-to-master'

This commit is contained in:
James Newton-King 2018-09-20 15:24:52 -07:00
commit 0d44670c9f
No known key found for this signature in database
GPG Key ID: 0A66B2F456BF5526
1 changed files with 3 additions and 3 deletions

View File

@ -306,8 +306,8 @@ namespace Microsoft.AspNetCore.Routing
public void TryProcessTemplate_ParameterPolicy_Includes_BufferedValues() public void TryProcessTemplate_ParameterPolicy_Includes_BufferedValues()
{ {
// Arrange // Arrange
var endpoint = EndpointFactory.CreateRouteEndpoint("Foo/{bar=BAR}/{id?}", policies: new { bar = new SlugifyParameterTransformer(), }); var endpoint = EndpointFactory.CreateRouteEndpoint("Foo/{bar=MyBar}/{id?}", policies: new { bar = new SlugifyParameterTransformer(), });
var linkGenerator = CreateLinkGenerator(new RouteOptions() { LowercaseUrls = true }, endpoints: new[] { endpoint, }); var linkGenerator = CreateLinkGenerator(endpoints: new[] { endpoint, });
var httpContext = CreateHttpContext(); var httpContext = CreateHttpContext();
// Act // Act
@ -321,7 +321,7 @@ namespace Microsoft.AspNetCore.Routing
// Assert // Assert
Assert.True(success); Assert.True(success);
Assert.Equal("/foo/bar/18", result.path.ToUriComponent()); Assert.Equal("/Foo/my-bar/18", result.path.ToUriComponent());
Assert.Equal(string.Empty, result.query.ToUriComponent()); Assert.Equal(string.Empty, result.query.ToUriComponent());
} }