Skip to content
Browse files

Fix for TestResponse.cookies returning cookies unescaped [#1867 state…

…:resolved]

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
  • Loading branch information...
1 parent f448c70 commit c877857d59554d78dbf45f5f9fcaafb8badec4e2 @dmcinnes dmcinnes committed with dhh Feb 3, 2009
View
5 actionpack/CHANGELOG
@@ -1,3 +1,8 @@
+*Edge*
+
+* Fixed that TestResponse.cookies was returning cookies unescaped #1867 [Doug McInnes]
+
+
*2.3.2 [Final] (March 15, 2009)*
* Fixed that redirection would just log the options, not the final url (which lead to "Redirected to #<Post:0x23150b8>") [DHH]
View
2 actionpack/lib/action_controller/test_process.rb
@@ -258,7 +258,7 @@ def has_template_object?(name=nil)
def cookies
cookies = {}
Array(headers['Set-Cookie']).each do |cookie|
- key, value = cookie.split(";").first.split("=")
+ key, value = cookie.split(";").first.split("=").map {|val| Rack::Utils.unescape(val)}
cookies[key] = value
end
cookies
View
10 actionpack/test/controller/cookie_test.rb
@@ -6,6 +6,10 @@ def authenticate
cookies["user_name"] = "david"
end
+ def set_with_with_escapable_characters
+ cookies["that & guy"] = "foo & bar => baz"
+ end
+
def authenticate_for_fourteen_days
cookies["user_name"] = { "value" => "david", "expires" => Time.utc(2005, 10, 10,5) }
end
@@ -53,6 +57,12 @@ def test_setting_cookie
assert_equal({"user_name" => "david"}, @response.cookies)
end
+ def test_setting_with_escapable_characters
+ get :set_with_with_escapable_characters
+ assert_equal ["that+%26+guy=foo+%26+bar+%3D%3E+baz; path=/"], @response.headers["Set-Cookie"]
+ assert_equal({"that & guy" => "foo & bar => baz"}, @response.cookies)
+ end
+
def test_setting_cookie_for_fourteen_days
get :authenticate_for_fourteen_days
assert_equal ["user_name=david; path=/; expires=Mon, 10-Oct-2005 05:00:00 GMT"], @response.headers["Set-Cookie"]

0 comments on commit c877857

Please sign in to comment.
Something went wrong with that request. Please try again.