summaryrefslogtreecommitdiffstats
path: root/test/cgi
diff options
context:
space:
mode:
authorxibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-02 12:37:30 +0000
committerxibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-02 12:37:30 +0000
commit587e92cdf98a7e1af4b0a5317e52e523b1e7800a (patch)
tree2d2dc0e37f6cc5e3b5f9d7f499dbb074aec11b19 /test/cgi
parent1d42215eb5c0a68c542f5855010bcc816c01fdb6 (diff)
downloadruby-587e92cdf98a7e1af4b0a5317e52e523b1e7800a.tar.gz
ruby-587e92cdf98a7e1af4b0a5317e52e523b1e7800a.tar.xz
ruby-587e92cdf98a7e1af4b0a5317e52e523b1e7800a.zip
* lib/cgi/core.rb (CGI::QueryExtension): delete MorphingBody
and replace like as 1.8's in multipart reading. see [ruby-dev:36443], reference from CGIAlt http://cgialt.rubyforge.org/ * test/cgi/test_cgi_multipart.rb : fixed multipart test. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/cgi')
-rwxr-xr-xtest/cgi/test_cgi_multipart.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/cgi/test_cgi_multipart.rb b/test/cgi/test_cgi_multipart.rb
index 18eb741d7..794021a9b 100755
--- a/test/cgi/test_cgi_multipart.rb
+++ b/test/cgi/test_cgi_multipart.rb
@@ -150,9 +150,9 @@ class CGIMultipartTest < Test::Unit::TestCase
name = hash[:name]
expected = hash[:value]
expected_class = @expected_class || (hash[:value].length < threshold ? StringIO : Tempfile)
- assert_kind_of(expected_class, cgi[name]) if RUBY_VERSION<"1.9"
- assert_equal(expected, cgi[name].read()) if RUBY_VERSION<"1.9"
- assert_equal(hash[:filename] || '', cgi[name].original_filename) #if hash[:filename]
+ assert_kind_of(expected_class, cgi[name])
+ assert_equal(expected, cgi[name].read())
+ assert_equal(hash[:filename] || '', cgi[name].original_filename) #if hash[:filename]
assert_equal(hash[:content_type] || '', cgi[name].content_type) #if hash[:content_type]
end
end
@@ -192,7 +192,7 @@ class CGIMultipartTest < Test::Unit::TestCase
]
@expected_class = Tempfile
_test_multipart()
- end
+ end if RUBY_VERSION < "1.9"
def _set_const(klass, name, value)