aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-21 18:16:16 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-21 18:16:16 -0700
commite6a66cbd056f177f7e60341799aa95791fcfa19d (patch)
tree69187bb418f8859a0f82325007a7f7ef272b571a
parentb99442933d9a4ffa7793d2cb2f73b2e9f22d2605 (diff)
downloadrails-e6a66cbd056f177f7e60341799aa95791fcfa19d.tar.gz
rails-e6a66cbd056f177f7e60341799aa95791fcfa19d.tar.bz2
rails-e6a66cbd056f177f7e60341799aa95791fcfa19d.zip
update rack tests for default response content_type and charset
-rw-r--r--actionpack/test/controller/rack_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index 30a1144aad..d5e56b9584 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -241,7 +241,7 @@ class RackResponseTest < BaseRackTest
status, headers, body = @response.out(@output)
assert_equal "200 OK", status
assert_equal({
- "Content-Type" => "text/html",
+ "Content-Type" => "text/html; charset=utf-8",
"Cache-Control" => "private, max-age=0, must-revalidate",
"ETag" => '"65a8e27d8879283831b664bd8b7f0ad4"',
"Set-Cookie" => [],
@@ -261,7 +261,7 @@ class RackResponseTest < BaseRackTest
status, headers, body = @response.out(@output)
assert_equal "200 OK", status
- assert_equal({"Content-Type" => "text/html", "Cache-Control" => "no-cache", "Set-Cookie" => []}, headers)
+ assert_equal({"Content-Type" => "text/html; charset=utf-8", "Cache-Control" => "no-cache", "Set-Cookie" => []}, headers)
parts = []
body.each { |part| parts << part }
@@ -278,7 +278,7 @@ class RackResponseTest < BaseRackTest
status, headers, body = @response.out(@output)
assert_equal "200 OK", status
assert_equal({
- "Content-Type" => "text/html",
+ "Content-Type" => "text/html; charset=utf-8",
"Cache-Control" => "private, max-age=0, must-revalidate",
"ETag" => '"65a8e27d8879283831b664bd8b7f0ad4"',
"Set-Cookie" => ["name=Josh; path="],