diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-04 12:11:53 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-07-04 12:11:53 +0200 |
| commit | 1bf5fc293d06d8bf8ce0c6a01a6c97fb395b5ee8 (patch) | |
| tree | 1a28393d55ef50a5567a06684985857071b01063 | |
| parent | f45718df3dddb74f6b7fd7f7ab5a3c858e2b423d (diff) | |
| download | rails-1bf5fc293d06d8bf8ce0c6a01a6c97fb395b5ee8.tar.gz rails-1bf5fc293d06d8bf8ce0c6a01a6c97fb395b5ee8.tar.bz2 rails-1bf5fc293d06d8bf8ce0c6a01a6c97fb395b5ee8.zip | |
remove useless `env.merge!(env)` from ActionDispatch::IntegrationTest`
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 19332a2bc2..9beb30307b 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -298,8 +298,6 @@ module ActionDispatch session = Rack::Test::Session.new(_mock_session) - env.merge!(env) - # NOTE: rack-test v0.5 doesn't build a default uri correctly # Make sure requested path is always a full uri uri = URI.parse('/') |