From 1bf5fc293d06d8bf8ce0c6a01a6c97fb395b5ee8 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Thu, 4 Jul 2013 12:11:53 +0200
Subject: remove useless `env.merge!(env)` from
 ActionDispatch::IntegrationTest`

---
 actionpack/lib/action_dispatch/testing/integration.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'actionpack')

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('/')
-- 
cgit v1.2.3