diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-20 15:57:15 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-21 11:21:10 -0700 |
| commit | 34fa6658dd1b779b21e586f01ee64c6f59ca1537 (patch) | |
| tree | 28b43f910a8c88c17b88f9ec991c0bdf89f86de9 /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | c6cfcc6124fdef4df3a406f389ba32be486cd437 (diff) | |
| download | rails-34fa6658dd1b779b21e586f01ee64c6f59ca1537.tar.gz rails-34fa6658dd1b779b21e586f01ee64c6f59ca1537.tar.bz2 rails-34fa6658dd1b779b21e586f01ee64c6f59ca1537.zip | |
pass a request object to the headers object
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 0cdc6d4e77..4dfd4f3f71 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -359,10 +359,10 @@ module ActionDispatch # this modifies the passed request_env directly if headers.present? - Http::Headers.new(request_env).merge!(headers) + Http::Headers.from_hash(request_env).merge!(headers) end if env.present? - Http::Headers.new(request_env).merge!(env) + Http::Headers.from_hash(request_env).merge!(env) end session = Rack::Test::Session.new(_mock_session) |