Make cookies hash in ActionDispatch::TestProcess indifferent access [#5761 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>

2 files changed, 19 insertions, 1 deletions

diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb
index c56ebc6438..16f3674164 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
-      @request.cookies.merge(@response.cookies)
+      HashWithIndifferentAccess.new(@request.cookies.merge(@response.cookies))
     end
 
     def redirect_to_url
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index faeae91f6b..5ec7f12cc1 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -94,6 +94,16 @@ class CookiesTest < ActionController::TestCase
       cookies.delete(:user_name, :domain => :all)
       head :ok
     end
+
+    def symbol_key
+      cookies[:user_name] = "david"
+      head :ok
+    end
+
+    def string_key
+      cookies['user_name'] = "david"
+      head :ok
+    end
   end
 
   tests TestController
@@ -291,6 +301,14 @@ class CookiesTest < ActionController::TestCase
     assert_cookie_header "user_name=; domain=.nextangle.com; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"
   end
 
+  def test_cookies_hash_is_indifferent_access
+    [:symbol_key, :string_key].each do |cookie_key|
+      get cookie_key
+      assert_equal "david", cookies[:user_name]
+      assert_equal "david", cookies['user_name']
+    end
+  end
+
   private
     def assert_cookie_header(expected)
       header = @response.headers["Set-Cookie"]