aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-04-26 11:37:11 -0500
committerJoshua Peek <josh@joshpeek.com>2009-04-26 11:37:11 -0500
commit6940c0de12eedcff6529ba0dfef533513cbcd389 (patch)
tree19391f3b35e17db87407b1eb72545df7b3f62242 /actionpack/test
parent3cb97aeea8837b9d2b7ed3f9806f5727ceef0e3d (diff)
downloadrails-6940c0de12eedcff6529ba0dfef533513cbcd389.tar.gz
rails-6940c0de12eedcff6529ba0dfef533513cbcd389.tar.bz2
rails-6940c0de12eedcff6529ba0dfef533513cbcd389.zip
Unify functional and integration tests cookie helpers
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/integration_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 9eeaa7b4e1..70fa41aded 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -297,7 +297,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
assert_response 410
assert_response :gone
assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"]
- assert_equal({"cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies)
+ assert_equal({"cookie_1"=>nil, "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies)
assert_equal "Gone", response.body
end
end