* Allow null ViewData and TempData

aspnet · Oct 12, 2015 · 9067ce7 · 9067ce7
1 parent 35d176f
commit 9067ce7
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 25 deletions.
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewContext.cs
@@ -58,16 +58,6 @@ public ViewContext(
                 throw new ArgumentNullException(nameof(view));
             }
 
-            if (viewData == null)
-            {
-                throw new ArgumentNullException(nameof(viewData));
-            }
-
-            if (tempData == null)
-            {
-                throw new ArgumentNullException(nameof(tempData));
-            }
-
             if (writer == null)
             {
                 throw new ArgumentNullException(nameof(writer));
@@ -114,11 +104,6 @@ public ViewContext(
                 throw new ArgumentNullException(nameof(view));
             }
 
-            if (viewData == null)
-            {
-                throw new ArgumentNullException(nameof(viewData));
-            }
-
             if (writer == null)
             {
                 throw new ArgumentNullException(nameof(writer));

diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs
@@ -119,16 +119,6 @@ public virtual async Task ExecuteAsync(
                 throw new ArgumentNullException(nameof(view));
             }
 
-            if (viewData == null)
-            {
-                throw new ArgumentNullException(nameof(viewData));
-            }
-
-            if (tempData == null)
-            {
-                throw new ArgumentNullException(nameof(tempData));
-            }
-
             var response = actionContext.HttpContext.Response;
 
             if (contentType != null && contentType.Encoding == null)

diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileResultTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.IO;
 using System.Text;
 using System.Threading;

diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs
@@ -97,6 +97,54 @@ public async Task ExecuteResultAsync_FindsAndExecutesView()
             viewEngine.Verify();
         }
 
+        [Fact]
+        public async Task ExecuteResultAsync_ViewResultAllowNullViewDataAndTempData()
+        {
+            var context = GetActionContext();
+            var controller = new TestController(context);
+
+            await controller.Index().ExecuteResultAsync(context);
+            Assert.Null(controller.ViewContext.ViewData);
+            Assert.Null(controller.ViewContext.TempData);
+        }
+
+        private class TestController
+        {
+            public ViewContext ViewContext { get; set; }
+            private IViewEngine _engine;
+            public TestController(ActionContext context)
+            {
+                var view = new Mock<IView>(MockBehavior.Strict);
+                view
+                    .Setup(v => v.RenderAsync(It.IsAny<ViewContext>())).Callback((ViewContext viewContext) =>
+                    {
+                        ViewContext = viewContext;
+                    })
+                    .Returns(Task.FromResult(0))
+                    .Verifiable();
+
+                view
+                    .As<IDisposable>()
+                    .Setup(v => v.Dispose())
+                    .Verifiable();
+                var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+                viewEngine
+                    .Setup(e => e.FindView(context, "myview"))
+                    .Returns(ViewEngineResult.Found("myview", view.Object))
+                    .Verifiable();
+
+                _engine = viewEngine.Object;
+            }
+
+            public IActionResult Index()
+            {
+                return new ViewResult {
+                    ViewEngine = _engine,
+                    ViewName = "myview"
+                };
+            }
+        }
+
         private ActionContext GetActionContext()
         {
             return new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor());