aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/response_test.rb
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2015-02-28 22:29:48 -0500
committereileencodes <eileencodes@gmail.com>2015-02-28 22:34:47 -0500
commit22e0a22d5f98e162290d9820891d8191e720ad3b (patch)
tree83746f4ba7710bb71e787101683021984110cf75 /actionpack/test/dispatch/response_test.rb
parent1d6ac919e6f1f44643279398820a59ed9d18151f (diff)
downloadrails-22e0a22d5f98e162290d9820891d8191e720ad3b.tar.gz
rails-22e0a22d5f98e162290d9820891d8191e720ad3b.tar.bz2
rails-22e0a22d5f98e162290d9820891d8191e720ad3b.zip
Fix segmentation fault in ActionPack tests
Introduced in f6e293e ActionPack tests began sefaulting. I found that it was the kwargs and the test causing the seg fault was missing the new default_headers argument.
Diffstat (limited to 'actionpack/test/dispatch/response_test.rb')
-rw-r--r--actionpack/test/dispatch/response_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index c61423dce4..f4c0b421d6 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -172,7 +172,7 @@ class ResponseTest < ActiveSupport::TestCase
original = ActionDispatch::Response.default_charset
begin
ActionDispatch::Response.default_charset = 'utf-16'
- resp = ActionDispatch::Response.new(200, { "Content-Type" => "text/xml" })
+ resp = ActionDispatch::Response.new(200, { "Content-Type" => "text/xml" }, default_headers: nil)
assert_equal('utf-16', resp.charset)
ensure
ActionDispatch::Response.default_charset = original