aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-04-20 20:06:30 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-04-20 20:06:30 -0700
commit696375ac628bd41edf3a8c8c00dde196696f4add (patch)
tree0b8ca850e462d5d2722ea4d2217d9c132a0e3cb1 /actionpack/test/dispatch/request/multipart_params_parsing_test.rb
parent685a53a360d0d8fc4a9f3b49f900621c940a71f2 (diff)
parentb10fb7e7bcb5efea6c93ae52bad125887cfc235c (diff)
downloadrails-696375ac628bd41edf3a8c8c00dde196696f4add.tar.gz
rails-696375ac628bd41edf3a8c8c00dde196696f4add.tar.bz2
rails-696375ac628bd41edf3a8c8c00dde196696f4add.zip
Merge branch 'master' into cherry
Diffstat (limited to 'actionpack/test/dispatch/request/multipart_params_parsing_test.rb')
-rw-r--r--actionpack/test/dispatch/request/multipart_params_parsing_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index 2f409f020d..88b81dc493 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -206,8 +206,8 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
end
def call(env)
- req = Rack::Request.new(env)
- req.params # Parse params
+ env['rack.input'].read
+ env['rack.input'].rewind
@app.call(env)
end
end