diff options
author | Sergey Alekseev <sergey.alekseev.minsk@gmail.com> | 2015-03-31 10:06:22 +0300 |
---|---|---|
committer | Sergey Alekseev <sergey.alekseev.minsk@gmail.com> | 2015-03-31 10:06:22 +0300 |
commit | 7f546318d56b75bafb798d0c178578600fd6939e (patch) | |
tree | 2977fed6e2234d4a0320b78a9d227d7d94acf6b0 /actionpack/lib/action_dispatch | |
parent | 151aa690a2f62e2daee106079e88ff43cd770611 (diff) | |
download | rails-7f546318d56b75bafb798d0c178578600fd6939e.tar.gz rails-7f546318d56b75bafb798d0c178578600fd6939e.tar.bz2 rails-7f546318d56b75bafb798d0c178578600fd6939e.zip |
write a test for `#form_data?`
The initial attempt was to remove the method at all in
https://github.com/sergey-alekseev/rails/commit/4926aa68c98673e7be88a2d2b57d72dc490bc71c.
The method overrides Rack's `#form_data?`
https://github.com/rack/rack/blob/6f8808d4201e68e4bd780441b3b7bb3ee6d1f43e/lib/rack/request.rb#L172-L184.
Which may have some incorrect implementation actually. `type.nil?` isn't possible I suppose. I'll check.
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 732ee67268..d8419ad804 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -282,8 +282,16 @@ module ActionDispatch end end + # Determine whether the request body contains form-data by checking + # the request Content-Type for one of the media-types: + # "application/x-www-form-urlencoded" or "multipart/form-data". The + # list of form-data media types can be modified through the + # +FORM_DATA_MEDIA_TYPES+ array. + # + # A request body is not assumed to contain form-data when no + # Content-Type header is provided and the request_method is POST. def form_data? - FORM_DATA_MEDIA_TYPES.include?(content_mime_type.to_s) + FORM_DATA_MEDIA_TYPES.include?(media_type) end def body_stream #:nodoc: |