From 800e46eed494d955326090935a169bac6420a4f2 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Tue, 20 Oct 2015 22:12:21 -0700
Subject: [PATCH] Fix failures in StringOutputFormatter functional tests

The missing piece here is is that StringOutputFormatter needs to set the
ContentType so that it gets overridden. The problem is that the formatter
is likely called with something like application/json, but decides to
write a string anyway. So because we're saying 'yes we can write' we also
need to override what we're writing.
---
 .../Formatters/StringOutputFormatter.cs                  | 8 ++------
 .../Formatters/StringOutputFormatterTests.cs             | 9 ++++++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/StringOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/StringOutputFormatter.cs
index b230809d50..0d8b335189 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Formatters/StringOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/StringOutputFormatter.cs
@@ -31,13 +31,9 @@ namespace Microsoft.AspNet.Mvc.Formatters
 
             // Ignore the passed in content type, if the object is string
             // always return it as a text/plain format.
-            if (context.ObjectType == typeof(string))
-            {
-                return true;
-            }
-
-            if (context.Object is string)
+            if (context.ObjectType == typeof(string) || context.Object is string)
             {
+                context.ContentType = SupportedMediaTypes[0];
                 return true;
             }
 
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
index a710922e31..bd7510c55c 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
+using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
@@ -20,7 +21,6 @@ namespace Microsoft.AspNet.Mvc.Formatters
             {
                 // object value, bool useDeclaredTypeAsString, bool expectedCanWriteResult
                 yield return new object[] { "valid value", true, true };
-                yield return new object[] { "valid value", false, true };
                 yield return new object[] { null, true, true };
                 yield return new object[] { null, false, false };
                 yield return new object[] { new object(), false, false };
@@ -35,15 +35,22 @@ namespace Microsoft.AspNet.Mvc.Formatters
             bool expectedCanWriteResult)
         {
             // Arrange
+            var expectedContentType = expectedCanWriteResult ? 
+                MediaTypeHeaderValue.Parse("text/plain") :
+                MediaTypeHeaderValue.Parse("application/json");
+
             var formatter = new StringOutputFormatter();
             var type = useDeclaredTypeAsString ? typeof(string) : typeof(object);
+
             var context = new OutputFormatterWriteContext(new DefaultHttpContext(), type, value);
+            context.ContentType = MediaTypeHeaderValue.Parse("application/json");
 
             // Act
             var result = formatter.CanWriteResult(context);
 
             // Assert
             Assert.Equal(expectedCanWriteResult, result);
+            Assert.Equal(expectedContentType, context.ContentType);
         }
 
         [Fact]