aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-08-08 18:22:43 -0400
committerGitHub <noreply@github.com>2017-08-08 18:22:43 -0400
commit7960ae27c8eb147e1c183a97d3b87492f897cdd7 (patch)
treee862a741dbd55f9d7101ac3a3e66bb19707fe654
parent1e3c1ed2352ffe237783e542ad27d7c576148975 (diff)
parent752e8172b6e2558cf6211734a735c9631f5832bb (diff)
downloadrails-7960ae27c8eb147e1c183a97d3b87492f897cdd7.tar.gz
rails-7960ae27c8eb147e1c183a97d3b87492f897cdd7.tar.bz2
rails-7960ae27c8eb147e1c183a97d3b87492f897cdd7.zip
Merge pull request #29767 from yui-knk/ac_test
Remove needless restoring of `default_charset`
-rw-r--r--actionpack/test/dispatch/response_test.rb9
1 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 67d6dea86f..a14083c6a2 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -296,13 +296,8 @@ class ResponseTest < ActiveSupport::TestCase
end
test "read content type with default charset utf-8" do
- original = ActionDispatch::Response.default_charset
- begin
- resp = ActionDispatch::Response.new(200, "Content-Type" => "text/xml")
- assert_equal("utf-8", resp.charset)
- ensure
- ActionDispatch::Response.default_charset = original
- end
+ resp = ActionDispatch::Response.new(200, "Content-Type" => "text/xml")
+ assert_equal("utf-8", resp.charset)
end
test "read content type with charset utf-16" do