From 5ad9a8e874db9e210123fde7a542cd2a05c6abd3 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 24 Mar 2012 11:20:43 -0300 Subject: [PATCH 1/2] Return the same session data object when setting session id --- .../lib/action_dispatch/middleware/session/cookie_store.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb index 8ebf870b95f8b..a4866f5a8facb 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 @@ def unpacked_cookie_data(env) 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) From 2ceb3fc56aa338583ceaf20a9b5834756d14291b Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Mon, 26 Mar 2012 20:16:12 -0300 Subject: [PATCH 2/2] Remove warning added by my own commit :fire: Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4 --- actionpack/test/template/form_helper_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb index 3b1af47770b6a..c5a32635f86fd 100644 --- a/actionpack/test/template/form_helper_test.rb +++ b/actionpack/test/template/form_helper_test.rb @@ -2238,7 +2238,7 @@ def initialize(object_name, object, template, options, block) 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