Merge pull request #21 from ByteBlast/master

Added support for checking for *any* file result.

Author: robdmoore

TestStack.FluentMVCTesting.Tests/ControllerResultTestTests.cs

@@ -27,6 +27,7 @@ class ControllerResultTestShould
             ReturnType<FileContentResult>(t => t.ShouldRenderFile()),
             ReturnType<FileStreamResult>(t => t.ShouldRenderFileStream()),
             ReturnType<FilePathResult>(t=> t.ShouldRenderFilePath()),
+            ReturnType<FileResult>(t => t.ShouldRenderAnyFile()),
             ReturnType<HttpStatusCodeResult>(t => t.ShouldGiveHttpStatus()),
             ReturnType<JsonResult>(t => t.ShouldReturnJson()),
         };
@@ -300,6 +301,21 @@ public void Check_for_invalid_partial_name()
             );
             Assert.That(exception.Message, Is.EqualTo(string.Format("Expected result view to be '{0}', but instead was given '{1}'.", ControllerResultTestController.PartialName, ControllerResultTestController.RandomViewName)));
         }
+        #endregion
+
+        #region File tests
+
+        [Test]
+        public void Check_for_any_file_result()
+        {
+            _controller.WithCallTo(c => c.EmptyFile()).ShouldRenderAnyFile();
+        }
+
+        [Test]
+        public void Check_for_any_file_result_and_check_content_type()
+        {
+            _controller.WithCallTo(c => c.EmptyFile()).ShouldRenderAnyFile(ControllerResultTestController.FileContentType);
+        }
 
         [Test]
         public void Check_for_file_result()
@@ -342,7 +358,6 @@ public void Check_for_file_path_result_and_check_file_name_and_check_content_typ
         {
             _controller.WithCallTo(c => c.EmptyFilePath()).ShouldRenderFilePath(ControllerResultTestController.FileName, ControllerResultTestController.FileContentType);
         }
-
         #endregion
 
         #region HTTP Status tests

TestStack.FluentMVCTesting.Tests/TestControllers/ControllerResultTestController.cs

@@ -131,41 +131,43 @@ public ActionResult DefaultPartialExplicit()
             return PartialView("DefaultPartialExplicit");
         }
 
-        public ActionResult EmptyFile()
+        public ActionResult NamedView()
         {
-            var content = new byte[] {};
-            return File(content, FileContentType);
+            return View(ViewName);
         }
 
-        public ActionResult EmptyStream()
+        public ActionResult NamedPartial()
         {
-            var content = new MemoryStream();
-            return File(content, FileContentType);
+            return PartialView(PartialName);
         }
 
-        public ActionResult EmptyFilePath()
+        public ActionResult RandomView()
         {
-            return File(FileName, FileContentType);
+            return View(RandomViewName);
         }
 
-        public ActionResult NamedView()
+        public ActionResult RandomPartial()
         {
-            return View(ViewName);
+            return PartialView(RandomViewName);
         }
+        #endregion
 
-        public ActionResult NamedPartial()
+        #region Files
+        public ActionResult EmptyFile()
         {
-            return PartialView(PartialName);
+            var content = new byte[] { };
+            return File(content, FileContentType);
         }
 
-        public ActionResult RandomView()
+        public ActionResult EmptyStream()
         {
-            return View(RandomViewName);
+            var content = new MemoryStream();
+            return File(content, FileContentType);
         }
 
-        public ActionResult RandomPartial()
+        public ActionResult EmptyFilePath()
         {
-            return PartialView(RandomViewName);
+            return File(FileName, FileContentType);
         }
         #endregion
 

TestStack.FluentMvcTesting/ControllerResultTest.cs

@@ -210,6 +210,24 @@ public ViewResultTest ShouldRenderDefaultPartialView()
             return ShouldRenderPartialView(_actionName);
         }
 
+        #endregion
+
+        #region File Results
+
+        public FileResult ShouldRenderAnyFile(string contentType = null)
+        {
+            ValidateActionReturnType<FileResult>();
+
+            var fileResult = (FileResult)_actionResult;
+
+            if (contentType != null && fileResult.ContentType != contentType)
+            {
+                throw new ActionResultAssertionException(string.Format("Expected file to be of content type '{0}', but instead was given '{1}'.", contentType, fileResult.ContentType));
+            }
+
+            return fileResult;
+        }
+
         public FileContentResult ShouldRenderFile(string contentType = null)
         {
             ValidateActionReturnType<FileContentResult>();
@@ -242,7 +260,7 @@ public FilePathResult ShouldRenderFilePath(string fileName = null, string conten
         {
             ValidateActionReturnType<FilePathResult>();
 
-            var fileResult = (FilePathResult) _actionResult;
+            var fileResult = (FilePathResult)_actionResult;
 
             if (fileName != null && fileName != fileResult.FileName)
             {