aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-02-25 07:45:45 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-02-25 07:45:45 -0800
commit0a1357b6fb8c76736d28b6b4a3584d167c02f0d7 (patch)
tree50e8fff81062244acd317fea5dc5fbc7e15b9638
parent8125304f20a5f719c8e451640060bb09f48737c7 (diff)
parenta9b1397f5f0d849fc043736772568378fcbc3d0a (diff)
downloadrails-0a1357b6fb8c76736d28b6b4a3584d167c02f0d7.tar.gz
rails-0a1357b6fb8c76736d28b6b4a3584d167c02f0d7.tar.bz2
rails-0a1357b6fb8c76736d28b6b4a3584d167c02f0d7.zip
Merge pull request #5170 from arunagw/3-2-stable
assert => assert_equal
-rw-r--r--actionpack/test/controller/integration_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index ea44e68da1..f96d31eae8 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -299,9 +299,9 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
_headers = headers["Set-Cookie"].split("\n")
assert _headers.include?("cookie_1=; path=/")
assert _headers.include?("cookie_3=chocolate; path=/")
- assert cookies.to_hash["cookie_1"], ""
- assert cookies.to_hash["cookie_2"], "oatmeal"
- assert cookies.to_hash["cookie_3"], "chocolate"
+ assert_equal cookies.to_hash["cookie_1"], ""
+ assert_equal cookies.to_hash["cookie_2"], "oatmeal"
+ assert_equal cookies.to_hash["cookie_3"], "chocolate"
end
end