Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

write_cookies! nil exception in ActionDispatch::TestRequest #2071

Merged
merged 1 commit into from
Jul 14, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion actionpack/lib/action_dispatch/testing/test_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def write_cookies!
end

def escape_cookie(name, value)
"#{Rack::Utils.escape(name)}=#{Rack::Utils.escape(value)}"
"#{Rack::Utils.escape(name)}=#{Rack::Utils.escape(value.to_s)}"
end

def delete_nil_values!
Expand Down
8 changes: 7 additions & 1 deletion actionpack/test/dispatch/test_request_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,11 @@ class TestRequestTest < ActiveSupport::TestCase
req.cookies["login"] = "XJ-122"
assert_equal({"user_name" => "david", "login" => "XJ-122"}, req.cookies)
assert_equal %w(login=XJ-122 user_name=david), req.env["HTTP_COOKIE"].split(/; /).sort
end

assert_nothing_raised do
req.cookies["login"] = nil
assert_equal({"user_name" => "david", "login" => nil}, req.cookies)
assert_equal %w(login= user_name=david), req.env["HTTP_COOKIE"].split(/; /).sort
end
end
end