aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/request
diff options
context:
space:
mode:
authorJarmo Isotalo <jamo@isotalo.fi>2014-02-08 15:30:14 -0800
committerJarmo Isotalo <jamo@isotalo.fi>2014-05-19 00:03:08 +0300
commitadffea62b5dc494e0e6bc2ca256bb592ce85f112 (patch)
tree15c1256914f887bc5b56442eef7b25cd20425822 /actionpack/test/dispatch/request
parentd29074af7a3da82ec4bab4f96ab802edeaa1cdb4 (diff)
downloadrails-adffea62b5dc494e0e6bc2ca256bb592ce85f112.tar.gz
rails-adffea62b5dc494e0e6bc2ca256bb592ce85f112.tar.bz2
rails-adffea62b5dc494e0e6bc2ca256bb592ce85f112.zip
Upgraded rack
As Rack has some non backwards compatible changes added required modifications to keep behaviour in rails close to same as before. Also modified generators to include rack/rack for not yet released version of rack
Diffstat (limited to 'actionpack/test/dispatch/request')
-rw-r--r--actionpack/test/dispatch/request/multipart_params_parsing_test.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index 2a2f92b5b3..46c3e3d19d 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -8,7 +8,11 @@ class MultipartParamsParsingTest < ActionDispatch::IntegrationTest
end
def parse
- self.class.last_request_parameters = request.request_parameters
+ self.class.last_request_parameters = begin
+ request.request_parameters
+ rescue EOFError
+ {}
+ end
self.class.last_parameters = request.parameters
head :ok
end