diff options
author | Jeremy Kemper <jeremykemper@gmail.com> | 2015-02-24 17:28:45 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremykemper@gmail.com> | 2015-02-25 09:49:25 -0700 |
commit | f6e293ec54f02f83cdb37502bea117f66f87bcae (patch) | |
tree | bf2d9a7d1de683860700a1c11ca0594bd304fc1e /actionpack/lib/action_dispatch/http | |
parent | 2abed7af6e4b87da7277952e9ad73681ac337f2e (diff) | |
download | rails-f6e293ec54f02f83cdb37502bea117f66f87bcae.tar.gz rails-f6e293ec54f02f83cdb37502bea117f66f87bcae.tar.bz2 rails-f6e293ec54f02f83cdb37502bea117f66f87bcae.zip |
Fix default headers in test responses
Fixes regression in #18423. Merge default headers for new responses,
but don't merge when creating a response from the last session request.
hat tip @senny :heart:
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
-rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index 4061ea71a3..a895d1ab18 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -113,10 +113,10 @@ module ActionDispatch # :nodoc: # The underlying body, as a streamable object. attr_reader :stream - def initialize(status = 200, header = {}, body = []) + def initialize(status = 200, header = {}, body = [], default_headers: self.class.default_headers) super() - header = merge_default_headers(header, self.class.default_headers) + header = merge_default_headers(header, default_headers) self.body, self.header, self.status = body, header, status @@ -308,9 +308,7 @@ module ActionDispatch # :nodoc: end def merge_default_headers(original, default) - return original unless default.respond_to?(:merge) - - default.merge(original) + default.respond_to?(:merge) ? default.merge(original) : original end def build_buffer(response, body) |