diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-07 20:58:54 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-07 20:58:54 +0000 |
| commit | 67b17d029a8eeddd908cce2d4e0e27e4708e8463 (patch) | |
| tree | 4cd589411104f7222835dd5012f4bb7743e1d215 /actionpack/lib/action_dispatch/testing/test_process.rb | |
| parent | bb063b2f1b3e5b6fb2a4732cb696929f1652c555 (diff) | |
| parent | 5968d7a65886d3450698889f685eccaf54749f43 (diff) | |
| download | rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.tar.gz rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.tar.bz2 rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/test_process.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/test_process.rb | 2 |
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 16f3674164..d430691429 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 - HashWithIndifferentAccess.new(@request.cookies.merge(@response.cookies)) + @request.cookies.merge(@response.cookies).with_indifferent_access end def redirect_to_url |