diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-26 16:24:42 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-26 16:24:42 -0700 |
| commit | b36f2408002f32c85bc31c459da43be4f4774ac4 (patch) | |
| tree | 4a6d6a0c359a8c4fe33bd0885f52256fa0e486ae | |
| parent | 281b31b4bb46b3b6e04fc7e6d97d2ab7024d3a78 (diff) | |
| parent | 2ceb3fc56aa338583ceaf20a9b5834756d14291b (diff) | |
| download | rails-b36f2408002f32c85bc31c459da43be4f4774ac4.tar.gz rails-b36f2408002f32c85bc31c459da43be4f4774ac4.tar.bz2 rails-b36f2408002f32c85bc31c459da43be4f4774ac4.zip | |
Merge pull request #5601 from carlosantoniodasilva/cookie-store-session-hash
Cookie store session hash
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/cookie_store.rb | 3 | ||||
| -rw-r--r-- | actionpack/test/template/form_helper_test.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb index 8ebf870b95..a4866f5a8f 100644 --- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb @@ -59,7 +59,8 @@ module ActionDispatch end def set_session(env, sid, session_data, options) - session_data.merge("session_id" => sid) + session_data["session_id"] = sid + session_data end def set_cookie(env, session_id, cookie) diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb index 3b1af47770..c5a32635f8 100644 --- a/actionpack/test/template/form_helper_test.rb +++ b/actionpack/test/template/form_helper_test.rb @@ -2238,7 +2238,7 @@ class FormHelperTest < ActionView::TestCase end end - assert_deprecated /Giving a block to FormBuilder is deprecated and has no effect anymore/ do + assert_deprecated(/Giving a block to FormBuilder is deprecated and has no effect anymore/) do builder_class.new(:foo, nil, nil, {}, proc {}) end end |