Merge pull request #1153 from Invizory/json-utf8

Fix JSON response default charset parameter value
NancyFx · Jul 15, 2013 · 2a2e3c4 · 2a2e3c4
2 parents e96bc7e + ee8a970
commit 2a2e3c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Nancy.Tests.Functional/Tests/JsonpTests.cs b/src/Nancy.Tests.Functional/Tests/JsonpTests.cs
@@ -57,7 +57,7 @@ public void Ensure_that_Jsonp_hook_does_not_affect_a_normal_json_response()
 
             Assert.Equal(HttpStatusCode.OK, result.StatusCode);
             Assert.Equal("true", result.Body.AsString());
-            Assert.Equal("application/json; charset=utf8", result.Context.Response.ContentType);
+            Assert.Equal("application/json; charset=utf-8", result.Context.Response.ContentType);
         }
 
         [Fact]
@@ -71,7 +71,7 @@ public void Ensure_that_Jsonp_hook_should_pad_a_json_response_when_callback_is_p
 
             Assert.Equal(HttpStatusCode.OK, result.StatusCode);
             Assert.Equal("myCallback(true);", result.Body.AsString());
-            Assert.Equal("application/javascript; charset=utf8", result.Context.Response.ContentType);
+            Assert.Equal("application/javascript; charset=utf-8", result.Context.Response.ContentType);
         }
     }
 }
diff --git a/src/Nancy.Tests/Unit/JsonFormatterExtensionsFixtures.cs b/src/Nancy.Tests/Unit/JsonFormatterExtensionsFixtures.cs
@@ -25,7 +25,7 @@ public JsonFormatterExtensionsFixtures()
         [Fact]
         public void Should_return_a_response_with_the_standard_json_content_type()
         {
-            response.ContentType.ShouldEqual("application/json; charset=utf8");
+            response.ContentType.ShouldEqual("application/json; charset=utf-8");
         }
 
         [Fact]

diff --git a/src/Nancy/Json/JsonSettings.cs b/src/Nancy/Json/JsonSettings.cs
@@ -29,7 +29,7 @@ static JsonSettings()
         {
             MaxJsonLength = 102400;
             MaxRecursions = 100;
-            DefaultCharset = "utf8";
+            DefaultCharset = "utf-8";
             Converters = new List<JavaScriptConverter>
                              {
                                  new TimeSpanConverter(),