aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-07-14 12:19:21 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-07-14 12:19:21 -0700
commitf88e9d83f13c7d29120696d7e568fae1efea67f4 (patch)
treeb5b4d0fc8a57e257a9424f31b8c587049681e77e
parent31ea0276a4f6059799ec031757caf2511d9c90c5 (diff)
parent4755930727b3a82f5573c487f4289759d3822735 (diff)
downloadrails-f88e9d83f13c7d29120696d7e568fae1efea67f4.tar.gz
rails-f88e9d83f13c7d29120696d7e568fae1efea67f4.tar.bz2
rails-f88e9d83f13c7d29120696d7e568fae1efea67f4.zip
Merge pull request #2073 from bfolkens/master
ported test from pull request #2071 to master
-rw-r--r--actionpack/test/dispatch/test_request_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb
index aa115608ef..4ee1d61146 100644
--- a/actionpack/test/dispatch/test_request_test.rb
+++ b/actionpack/test/dispatch/test_request_test.rb
@@ -40,6 +40,11 @@ class TestRequestTest < ActiveSupport::TestCase
req.cookie_jar["login"] = "XJ-122"
assert_cookies({"user_name" => "david", "login" => "XJ-122"}, req.cookie_jar)
+ assert_nothing_raised do
+ req.cookie_jar["login"] = nil
+ assert_cookies({"user_name" => "david", "login" => nil}, req.cookie_jar)
+ end
+
req.cookie_jar.delete(:login)
assert_cookies({"user_name" => "david"}, req.cookie_jar)