aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing
diff options
context:
space:
mode:
authoreparreno <emili@eparreno.com>2010-11-15 22:16:17 +0100
committereparreno <emili@eparreno.com>2010-11-15 22:16:17 +0100
commitca4b4c0baa240baea0eaf372283dbd33ec671b6a (patch)
tree0ca0ee53b1d03d76f82c3ba481da53c1e5499084 /actionpack/lib/action_dispatch/testing
parent04775a41cbbddceeffa9cf8590566b9990fd4070 (diff)
parent91a6db90cf8b2c07af4cf64a9c587268106aadd5 (diff)
downloadrails-ca4b4c0baa240baea0eaf372283dbd33ec671b6a.tar.gz
rails-ca4b4c0baa240baea0eaf372283dbd33ec671b6a.tar.bz2
rails-ca4b4c0baa240baea0eaf372283dbd33ec671b6a.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
-rw-r--r--actionpack/lib/action_dispatch/testing/test_process.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb
index c56ebc6438..16f3674164 100644
--- a/actionpack/lib/action_dispatch/testing/test_process.rb
+++ b/actionpack/lib/action_dispatch/testing/test_process.rb
@@ -22,7 +22,7 @@ module ActionDispatch
end
def cookies
- @request.cookies.merge(@response.cookies)
+ HashWithIndifferentAccess.new(@request.cookies.merge(@response.cookies))
end
def redirect_to_url