Merge pull request rails#5601 from carlosantoniodasilva/cookie-store-…

…session-hash Cookie store session hash
drogus · Mar 26, 2012 · b36f240 · b36f240
2 parents 281b31b + 2ceb3fc
commit b36f240
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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)

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