Merge pull request #20 from ByteBlast/master

Added support for checking for a file path results' file name and content type.

Author: robdmoore

TestStack.FluentMVCTesting.Tests/ControllerResultTestTests.cs

@@ -331,6 +331,18 @@ public void Check_for_file_path_result()
             _controller.WithCallTo(c => c.EmptyFilePath()).ShouldRenderFilePath();
         }
 
+        [Test]
+        public void Check_for_file_path_result_and_check_file_name()
+        {
+            _controller.WithCallTo(c => c.EmptyFilePath()).ShouldRenderFilePath(ControllerResultTestController.FileName);
+        }
+
+        [Test]
+        public void Check_for_file_path_result_and_check_file_name_and_check_content_type()
+        {
+            _controller.WithCallTo(c => c.EmptyFilePath()).ShouldRenderFilePath(ControllerResultTestController.FileName, ControllerResultTestController.FileContentType);
+        }
+
         #endregion
 
         #region HTTP Status tests

TestStack.FluentMVCTesting.Tests/TestControllers/ControllerResultTestController.cs

@@ -14,6 +14,7 @@ class ControllerResultTestController : Controller
         public const string RandomViewName = "Random";
         public const int Code = 403;
         public const string JsonValue = "json";
+        public const string FileName = "NamedFile";
         #endregion
 
         #region Empty, Null and Random Results
@@ -144,7 +145,7 @@ public ActionResult EmptyStream()
 
         public ActionResult EmptyFilePath()
         {
-            return File("dummy", FileContentType);
+            return File(FileName, FileContentType);
         }
 
         public ActionResult NamedView()

TestStack.FluentMvcTesting/ControllerResultTest.cs

@@ -238,10 +238,23 @@ public FileStreamResult ShouldRenderFileStream(string contentType = null)
             return fileResult;
         }
 
-        public FilePathResult ShouldRenderFilePath()
+        public FilePathResult ShouldRenderFilePath(string fileName = null, string contentType = null)
         {
             ValidateActionReturnType<FilePathResult>();
-            return (FilePathResult)_actionResult;
+
+            var fileResult = (FilePathResult) _actionResult;
+
+            if (fileName != null && fileName != fileResult.FileName)
+            {
+                throw new ActionResultAssertionException(string.Format("Expected file name to be '{0}', but instead was given '{1}'.", fileName, fileResult.FileName));
+            }
+
+            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;
         }
 
         #endregion