aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/request
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-01-17 20:29:50 -0600
committerJoshua Peek <josh@joshpeek.com>2009-01-17 20:29:50 -0600
commitff0a2678c4bce9da348e1263915558795e3a3640 (patch)
tree3c5b6ab01afaa3d01198d8755e1dc38fa18f5af4 /actionpack/test/controller/request
parentaab760c3df4c02377a59a418fc077cdbc07e9fdc (diff)
downloadrails-ff0a2678c4bce9da348e1263915558795e3a3640.tar.gz
rails-ff0a2678c4bce9da348e1263915558795e3a3640.tar.bz2
rails-ff0a2678c4bce9da348e1263915558795e3a3640.zip
Build query string and POST params parser on top of Rack::Request. Also switch our multipart parser to use Racks. Moved XML, JSON, and YAML parsers into ActionController::ParamsParser middleware [#1661 state:resolved]
Diffstat (limited to 'actionpack/test/controller/request')
-rw-r--r--actionpack/test/controller/request/multipart_params_parsing_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/request/multipart_params_parsing_test.rb b/actionpack/test/controller/request/multipart_params_parsing_test.rb
index 137fdbee54..d7ade40f71 100644
--- a/actionpack/test/controller/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/controller/request/multipart_params_parsing_test.rb
@@ -36,7 +36,7 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
assert_equal 'bar', params['foo']
file = params['file']
- assert_kind_of StringIO, file
+ assert_kind_of Tempfile, file
assert_equal 'file.txt', file.original_filename
assert_equal "text/plain", file.content_type
assert_equal 'contents', file.read
@@ -77,13 +77,13 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
assert_equal 'bar', params['foo']
file = params['file']
- assert_kind_of StringIO, file
+ assert_kind_of Tempfile, file
assert_equal 'file.csv', file.original_filename
assert_nil file.content_type
assert_equal 'contents', file.read
file = params['flowers']
- assert_kind_of StringIO, file
+ assert_kind_of Tempfile, file
assert_equal 'flowers.jpg', file.original_filename
assert_equal "image/jpeg", file.content_type
assert_equal 19512, file.size