diff options
| -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 |