aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-08-09 23:06:22 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-08-09 23:06:22 -0700
commit5a0372f7dbfb092f84146985ed5b545fb45a5009 (patch)
treef8912f3d3faa7589b5cba0fefb6e9a8e915e041d
parent581a9277102e66132a98cd1e8df93f904628585e (diff)
parente1579033100fe5a5738791c6f2fd4309c7ca3d78 (diff)
downloadrails-5a0372f7dbfb092f84146985ed5b545fb45a5009.tar.gz
rails-5a0372f7dbfb092f84146985ed5b545fb45a5009.tar.bz2
rails-5a0372f7dbfb092f84146985ed5b545fb45a5009.zip
Merge pull request #7315 from brainopia/fix_assertion
Fix mistake in assertion about content of permanent cookie
-rw-r--r--actionpack/test/dispatch/cookies_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 2467654a70..347b3b3b5a 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -190,7 +190,7 @@ class CookiesTest < ActionController::TestCase
def test_setting_the_same_value_to_permanent_cookie
request.cookies[:user_name] = 'Jamie'
get :set_permanent_cookie
- assert response.cookies, 'user_name' => 'Jamie'
+ assert_equal response.cookies, 'user_name' => 'Jamie'
end
def test_setting_with_escapable_characters