diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-07-08 11:46:56 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-07-08 11:46:56 -0700 |
| commit | 97d62a32f824ca54c6dee2033decb78f85217361 (patch) | |
| tree | 7c7fc50df28335550aefba8c917777d784fcccc3 /actionpack/test/dispatch/request | |
| parent | 3116dac121df6d2c9e1db683a9a95b56bd203b12 (diff) | |
| parent | 46890ad18840a3f311bf3bf68e03cc605ca7bf12 (diff) | |
| download | rails-97d62a32f824ca54c6dee2033decb78f85217361.tar.gz rails-97d62a32f824ca54c6dee2033decb78f85217361.tar.bz2 rails-97d62a32f824ca54c6dee2033decb78f85217361.zip | |
Merge pull request #13999 from jamox/update_rack
This updates rails to use edge rack
Diffstat (limited to 'actionpack/test/dispatch/request')
| -rw-r--r-- | actionpack/test/dispatch/request/multipart_params_parsing_test.rb | 6 |
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 2db3fee6bb..926472163e 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 |