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

Merge branch 'release/2.1' into dev

This commit is contained in:
Kiran Challa 2018-05-01 14:05:13 -07:00
parent 84c8db5aae 35f7d3f09c
commit cb97a93fff
3 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
View File

@ -684,8 +684,8 @@ Hello from /Pages/WithViewStart/Index.cshtml!";
public async Task PropertiesOnPageModelAreBound()
{
// Arrange
var expected = "Id = 10, Name = Foo, Age = 25";
var request = new HttpRequestMessage(HttpMethod.Post, "Pages/PropertyBinding/PageModelWithPropertyBinding/10")
var expected = "Id = 10, Name = Foo, Age = 25, PropertyWithSupportGetsTrue = foo";
var request = new HttpRequestMessage(HttpMethod.Post, "Pages/PropertyBinding/PageModelWithPropertyBinding/10?PropertyWithSupportGetsTrue=foo")
{
Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
{
@ -711,7 +711,7 @@ Hello from /Pages/WithViewStart/Index.cshtml!";
var url = "Pages/PropertyBinding/PageModelWithPropertyBinding/27";
var expected = new[]
{
"Id = 27, Name = , Age = 325",
"Id = 27, Name = , Age = 325, PropertyWithSupportGetsTrue =",
"The Name field is required.",
"The field Age must be between 0 and 99.",
};
@ -787,6 +787,38 @@ Hello from /Pages/WithViewStart/Index.cshtml!";
Assert.DoesNotContain(validationError, content);
}
[Fact]
public async Task PageProperty_WithSupportsGetTrue_OnPageWithHandler_FuzzyMatchesHeadRequest()
{
// Arrange
var request = new HttpRequestMessage(HttpMethod.Head, "Pages/PropertyBinding/PageModelWithPropertyBinding/10?PropertyWithSupportGetsTrue=foo");
// Act
var response = await Client.SendAsync(request);
// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Assert.NotNull(response.Content);
Assert.NotNull(response.Content.Headers.ContentType);
Assert.Equal("text/html", response.Content.Headers.ContentType.MediaType);
}
[Fact]
public async Task PageProperty_WithSupportsGetTrue_OnPageWithNoHandler_FuzzyMatchesHeadRequest()
{
// Arrange
var request = new HttpRequestMessage(HttpMethod.Head, "Pages/PropertyBinding/BindPropertyWithGet?value=11");
// Act
var response = await Client.SendAsync(request);
// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Assert.NotNull(response.Content);
Assert.NotNull(response.Content.Headers.ContentType);
Assert.Equal("text/html", response.Content.Headers.ContentType.MediaType);
}
[Fact]
public async Task PageProperty_WithSupportsGet_BoundInGet()
{

4
test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cs
View File

@ -14,6 +14,10 @@ namespace RazorPagesWebSite
[FromRoute]
public int Id { get; set; }
[BindProperty(SupportsGet = true)]
[FromQuery]
public string PropertyWithSupportGetsTrue { get; set; }
public void OnGet() { }
}
}

2
test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cshtml
View File

@ -1,6 +1,6 @@
@page "{id:int}"
@model PageModelWithPropertyBinding
Id = @Model.Id, Name = @Model.UserModel?.Name, Age = @Model.UserModel?.Age
Id = @Model.Id, Name = @Model.UserModel?.Name, Age = @Model.UserModel?.Age, PropertyWithSupportGetsTrue = @Model.PropertyWithSupportGetsTrue
@Html.ValidationSummary()
<form action="">