additional common mime-type mappings added.

drunkcod · Apr 14, 2011 · 6bec0dc · 6bec0dc
1 parent ad42d1f
commit 6bec0dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Source/Web/FileHttpHandler.cs b/Source/Web/FileHttpHandler.cs
@@ -1,5 +1,4 @@
-using System.IO;
-using System.Web;
+using System.Web;
 using Concoct.IO;
 
 namespace Concoct.Web
@@ -25,6 +24,11 @@ public void ProcessRequest(HttpContext context) {
         string MimeTypeFromExtension(string extension) {
             switch(extension) {
                 case ".css": return "text/css";
+                case ".gif": return "image/gif";
+                case ".jpg": return "image/jpeg";
+                case ".png": return "image/png";
+                case ".txt": return "text/plain";
+                case ".xml": return "text/xml";
                 default: return "application/octet-stream";
             }
         }

diff --git a/Tests/Web/FileHttpHandlerSpec.cs b/Tests/Web/FileHttpHandlerSpec.cs
@@ -11,12 +11,16 @@ public class FileHttpHandlerSpec
     {
         [Row(".???", "application/octet-stream")
         ,Row(".css", "text/css")
+        ,Row(".xml", "text/xml")
+        ,Row(".txt", "text/plain")
+        ,Row(".gif", "image/gif")
+        ,Row(".png", "image/png")
+        ,Row(".jpg", "image/jpeg")
         ,DisplayAs("{0} => {1}")]
         public void content_type(string extension, string mimeType) {
-            var message = "Hello World!";
             var fileInfo = new Moq.Mock<IFileInfo>();
             fileInfo.Setup(x => x.Extension).Returns(extension);
-            fileInfo.Setup(x => x.OpenRead()).Returns(StreamWith(message));
+            fileInfo.Setup(x => x.OpenRead()).Returns(StreamWith("<this doesn't matter>"));
 
             WithResponseFrom(fileInfo.Object, response => {
                 Verify.That(() => response.ContentType == mimeType);