1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix test for 1.8

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
xibbar 2008-10-24 11:05:39 +00:00
parent 3896936492
commit 23ed2fcc31
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/cgi/test_cgi_multipart.rb
View File

@ -189,12 +189,13 @@ class CGIMultipartTest < Test::Unit::TestCase
@boundary = '----WebKitFormBoundaryAAfvAII+YL9102cX' @boundary = '----WebKitFormBoundaryAAfvAII+YL9102cX'
@data = [ @data = [
{:name=>'hidden1', :value=>'foobar'}, {:name=>'hidden1', :value=>'foobar'},
{:name=>'text1', :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A".force_encoding("UTF-8")}, {:name=>'text1', :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A"},
{:name=>'file1', :value=>_read('file1.html'), {:name=>'file1', :value=>_read('file1.html'),
:filename=>'file1.html', :content_type=>'text/html'}, :filename=>'file1.html', :content_type=>'text/html'},
{:name=>'image1', :value=>_read('small.png'), {:name=>'image1', :value=>_read('small.png'),
:filename=>'small.png', :content_type=>'image/png'}, # small image :filename=>'small.png', :content_type=>'image/png'}, # small image
] ]
@data[1][:value].force_encoding("UTF-8") if RUBY_VERSION>="1.9"
@expected_class = StringIO @expected_class = StringIO
_test_multipart() _test_multipart()
end end
@ -204,12 +205,13 @@ class CGIMultipartTest < Test::Unit::TestCase
@boundary = '----WebKitFormBoundaryAAfvAII+YL9102cX' @boundary = '----WebKitFormBoundaryAAfvAII+YL9102cX'
@data = [ @data = [
{:name=>'hidden1', :value=>'foobar'}, {:name=>'hidden1', :value=>'foobar'},
{:name=>'text1', :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A".force_encoding("UTF-8")}, {:name=>'text1', :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A"},
{:name=>'file1', :value=>_read('file1.html'), {:name=>'file1', :value=>_read('file1.html'),
:filename=>'file1.html', :content_type=>'text/html'}, :filename=>'file1.html', :content_type=>'text/html'},
{:name=>'image1', :value=>_read('large.png'), {:name=>'image1', :value=>_read('large.png'),
:filename=>'large.png', :content_type=>'image/png'}, # large image :filename=>'large.png', :content_type=>'image/png'}, # large image
] ]
@data[1][:value].force_encoding("UTF-8") if RUBY_VERSION>="1.9"
@expected_class = Tempfile @expected_class = Tempfile
_test_multipart() _test_multipart()
end end
@ -295,12 +297,13 @@ class CGIMultipartTest < Test::Unit::TestCase
@boundary = '(.|\n)*' @boundary = '(.|\n)*'
@data = [ @data = [
{:name=>'hidden1', :value=>'foobar'}, {:name=>'hidden1', :value=>'foobar'},
{:name=>'text1', :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A".force_encoding("UTF-8")}, {:name=>'text1', :value=>"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A"},
{:name=>'file1', :value=>_read('file1.html'), {:name=>'file1', :value=>_read('file1.html'),
:filename=>'file1.html', :content_type=>'text/html'}, :filename=>'file1.html', :content_type=>'text/html'},
{:name=>'image1', :value=>_read('small.png'), {:name=>'image1', :value=>_read('small.png'),
:filename=>'small.png', :content_type=>'image/png'}, # small image :filename=>'small.png', :content_type=>'image/png'}, # small image
] ]
@data[1][:value].force_encoding("UTF-8") if RUBY_VERSION>="1.9"
_prepare(@data) _prepare(@data)
cgi = RUBY_VERSION>="1.9" ? CGI.new(:accept_charset=>"UTF-8") : CGI.new cgi = RUBY_VERSION>="1.9" ? CGI.new(:accept_charset=>"UTF-8") : CGI.new
assert_equal('file1.html', cgi['file1'].original_filename) assert_equal('file1.html', cgi['file1'].original_filename)