aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorGrzegorz Derebecki <grzegorz.derebecki@fdb.pl>2013-03-16 15:26:42 +0100
committerGrzegorz Derebecki <grzegorz.derebecki@fdb.pl>2013-03-17 10:51:08 +0100
commit3ab7ddb8daa1d1754a9de06ee3cbc790f2025144 (patch)
tree5bd997f65f22d4afa22063060bb9654c6b02aedd /actionpack
parent9a421aaa8285cf2a7ecb1af370748b0337818930 (diff)
downloadrails-3ab7ddb8daa1d1754a9de06ee3cbc790f2025144.tar.gz
rails-3ab7ddb8daa1d1754a9de06ee3cbc790f2025144.tar.bz2
rails-3ab7ddb8daa1d1754a9de06ee3cbc790f2025144.zip
Allow pass multipart option to form_for
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb2
-rw-r--r--actionpack/test/template/form_helper_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 3dae1fc87a..6b6a7edc1d 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -433,7 +433,7 @@ module ActionView
builder = instantiate_builder(object_name, object, options)
output = capture(builder, &block)
- html_options[:multipart] = builder.multipart?
+ html_options[:multipart] ||= builder.multipart?
form_tag(options[:url] || {}, html_options) { output }
end
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 268bab6ad2..dff0b8bdc2 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -2791,8 +2791,8 @@ class FormHelperTest < ActionView::TestCase
end
def test_form_for_with_html_options_adds_options_to_form_tag
- form_for(@post, html: { id: 'some_form', class: 'some_class' }) do |f| end
- expected = whole_form("/posts/123", "some_form", "some_class", method: "patch")
+ form_for(@post, html: { id: 'some_form', class: 'some_class', multipart: true }) do |f| end
+ expected = whole_form("/posts/123", "some_form", "some_class", method: "patch", multipart: "multipart/form-data")
assert_dom_equal expected, output_buffer
end