parent
1126d47b3e
commit
29ea696c5a
|
|
@ -28,6 +28,11 @@ namespace Microsoft.AspNet.Mvc
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
public string ViewName { get; set; }
|
public string ViewName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the view data model.
|
||||||
|
/// </summary>
|
||||||
|
public object Model => ViewData?.Model;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the <see cref="ViewDataDictionary"/> for this result.
|
/// Gets or sets the <see cref="ViewDataDictionary"/> for this result.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,33 @@ namespace Microsoft.AspNet.Mvc
|
||||||
// and ViewExecutorTest for more comprehensive tests.
|
// and ViewExecutorTest for more comprehensive tests.
|
||||||
public class ViewResultTest
|
public class ViewResultTest
|
||||||
{
|
{
|
||||||
|
[Fact]
|
||||||
|
public void Model_NullWhenViewDataIsNull()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var viewResult = new ViewResult();
|
||||||
|
|
||||||
|
// Act & Assert
|
||||||
|
Assert.Null(viewResult.Model);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Model_ExposesViewDataModel()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var customModel = new object();
|
||||||
|
var viewResult = new ViewResult
|
||||||
|
{
|
||||||
|
ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider())
|
||||||
|
{
|
||||||
|
Model = customModel
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
// Act & Assert
|
||||||
|
Assert.Same(customModel, viewResult.Model);
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task ExecuteResultAsync_Throws_IfViewCouldNotBeFound_MessageUsesGetViewLocations()
|
public async Task ExecuteResultAsync_Throws_IfViewCouldNotBeFound_MessageUsesGetViewLocations()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue