summaryrefslogtreecommitdiff
path: root/test/cgi/test_cgi_cookie.rb
diff options
context:
space:
mode:
authorxibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-30 05:34:02 +0000
committerxibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-30 05:34:02 +0000
commit1976ef38a7630addb63689053b6dc1d4889d934d (patch)
tree421dc7a33bfe1ca30362f58fdc76ed6c352828a2 /test/cgi/test_cgi_cookie.rb
parent3ca25b5a292edfee968d64aac686b46265cad5b5 (diff)
* lib/cgi/util.rb (CGI::unescape): support encoding option.
* lib/cgi/cookie.rb (CGI::Cookie.parse): fix for the encoded value. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/cgi/test_cgi_cookie.rb')
-rw-r--r--test/cgi/test_cgi_cookie.rb17
1 files changed, 10 insertions, 7 deletions
diff --git a/test/cgi/test_cgi_cookie.rb b/test/cgi/test_cgi_cookie.rb
index f9950d1fb13..c55b52ed036 100644
--- a/test/cgi/test_cgi_cookie.rb
+++ b/test/cgi/test_cgi_cookie.rb
@@ -8,6 +8,8 @@ class CGICookieTest < Test::Unit::TestCase
def setup
ENV['REQUEST_METHOD'] = 'GET'
+ @str1="\xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93"
+ @str1.force_encoding("UTF-8") if RUBY_VERSION>="1.9"
end
def teardown
@@ -18,20 +20,21 @@ class CGICookieTest < Test::Unit::TestCase
def test_cgi_cookie_new_simple
- cookie = CGI::Cookie.new('name1', 'val1', '&<>"', "\245\340\245\271\245\253")
+ cookie = CGI::Cookie.new('name1', 'val1', '&<>"', @str1)
assert_equal('name1', cookie.name)
- assert_equal(['val1', '&<>"', "\245\340\245\271\245\253"], cookie.value)
+ assert_equal(['val1', '&<>"', @str1], cookie.value)
assert_nil(cookie.domain)
assert_nil(cookie.expires)
assert_equal('', cookie.path)
assert_equal(false, cookie.secure)
- assert_equal("name1=val1&%26%3C%3E%22&%A5%E0%A5%B9%A5%AB; path=", cookie.to_s)
+ assert_equal("name1=val1&%26%3C%3E%22&%E3%82%86%E3%82%93%E3%82%86%E3%82%93; path=", cookie.to_s)
end
def test_cgi_cookie_new_complex
t = Time.gm(2030, 12, 31, 23, 59, 59)
- value = ['val1', '&<>"', "\245\340\245\271\245\253"]
+ value = ['val1', '&<>"', "\xA5\xE0\xA5\xB9\xA5\xAB"]
+ value[2].force_encoding("EUC-JP") if RUBY_VERSION>="1.9"
cookie = CGI::Cookie.new('name'=>'name1',
'value'=>value,
'path'=>'/cgi-bin/myapp/',
@@ -65,11 +68,11 @@ class CGICookieTest < Test::Unit::TestCase
def test_cgi_cookie_parse
## ';' separator
- cookie_str = 'name1=val1&val2; name2=val2&%26%3C%3E%22;_session_id=12345'
+ cookie_str = 'name1=val1&val2; name2=val2&%26%3C%3E%22&%E3%82%86%E3%82%93%E3%82%86%E3%82%93;_session_id=12345'
cookies = CGI::Cookie.parse(cookie_str)
list = [
['name1', ['val1', 'val2']],
- ['name2', ['val2', '&<>"']],
+ ['name2', ['val2', '&<>"',@str1]],
['_session_id', ['12345']],
]
list.each do |name, value|
@@ -78,7 +81,7 @@ class CGICookieTest < Test::Unit::TestCase
assert_equal(value, cookie.value)
end
## ',' separator
- cookie_str = 'name1=val1&val2, name2=val2&%26%3C%3E%22,_session_id=12345'
+ cookie_str = 'name1=val1&val2, name2=val2&%26%3C%3E%22&%E3%82%86%E3%82%93%E3%82%86%E3%82%93,_session_id=12345'
cookies = CGI::Cookie.parse(cookie_str)
list.each do |name, value|
cookie = cookies[name]