diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-24 01:34:49 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-24 17:19:42 -0300 |
| commit | 3de95fd9303ea2a2ffa5184f8cf32db63cb7f4ac (patch) | |
| tree | 38e6d7d3e074aabe1aa5d2c0be6965aeb0d2414b /actionpack/lib | |
| parent | e69011521da0a9d4559436da21ea030465e54d08 (diff) | |
| download | rails-3de95fd9303ea2a2ffa5184f8cf32db63cb7f4ac.tar.gz rails-3de95fd9303ea2a2ffa5184f8cf32db63cb7f4ac.tar.bz2 rails-3de95fd9303ea2a2ffa5184f8cf32db63cb7f4ac.zip | |
Revert "Make process reuse the env var passed as argument"
This reverts commit 0e4748cd415660eb91e63d50aa15cdd027c612dd.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index aae5752c93..0f1bb9f260 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -241,8 +241,8 @@ module ActionDispatch end # Performs the actual request. - def process(method, path, parameters = nil, env = nil) - env ||= {} + def process(method, path, parameters = nil, rack_env = nil) + rack_env ||= {} if path =~ %r{://} location = URI.parse(path) https! URI::HTTPS === location if location.scheme @@ -258,7 +258,7 @@ module ActionDispatch hostname, port = host.split(':') - default_env = { + env = { :method => method, :params => parameters, @@ -276,7 +276,7 @@ module ActionDispatch session = Rack::Test::Session.new(_mock_session) - env.reverse_merge!(default_env) + env.merge!(rack_env) # NOTE: rack-test v0.5 doesn't build a default uri correctly # Make sure requested path is always a full uri |