From 9d441579247b28979539d117b730548afa12fefb Mon Sep 17 00:00:00 2001
From: eileencodes <eileencodes@gmail.com>
Date: Tue, 21 Jun 2016 17:23:08 -0400
Subject: Revert "Merge pull request #17973 from
 maurogeorge/file_field_hidden_field"

The reason we are reverting this commit is because it created breaking
changes for file upload gems. For more information see discussion here:
https://github.com/rails/rails/issues/17947#issuecomment-225154294

This reverts commit c455817804e4df64c46c17a0cdec0e5a1ca5ba2e, reversing
changes made to 8b3cd74b8a09ef85a43d7631bb062a9ec7f57227.

Conflicts:
	actionview/CHANGELOG.md
	actionview/lib/action_view/helpers/form_helper.rb
---
 actionview/lib/action_view/helpers/form_helper.rb  | 18 ----------------
 .../lib/action_view/helpers/tags/file_field.rb     | 15 -------------
 actionview/test/template/form_helper_test.rb       | 25 +++++-----------------
 3 files changed, 5 insertions(+), 53 deletions(-)

(limited to 'actionview')

diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb
index be5010cd9c..90bc39a478 100644
--- a/actionview/lib/action_view/helpers/form_helper.rb
+++ b/actionview/lib/action_view/helpers/form_helper.rb
@@ -860,24 +860,6 @@ module ActionView
       #
       #   file_field(:attachment, :file, class: 'file_input')
       #   # => <input type="file" id="attachment_file" name="attachment[file]" class="file_input" />
-      #
-      # ==== Gotcha
-      #
-      # The HTML specification says that when a file field is empty, web browsers
-      # do not send any value to the server. Unfortunately this introduces a
-      # gotcha: if a +User+ model has an +avatar+ field, and no file is selected,
-      # then the +avatar+ parameter is empty. Thus, any mass-assignment idiom like
-      #
-      #   @user.update(params[:user])
-      #
-      # wouldn't update the +avatar+ field.
-      #
-      # To prevent this, the helper generates an auxiliary hidden field before
-      # every file field. The hidden field has the same name as the file one and
-      # a blank value.
-      #
-      # In case you don't want the helper to generate this hidden field you can
-      # specify the <tt>include_hidden: false</tt> option.
       def file_field(object_name, method, options = {})
         Tags::FileField.new(object_name, method, self, options).render
       end
diff --git a/actionview/lib/action_view/helpers/tags/file_field.rb b/actionview/lib/action_view/helpers/tags/file_field.rb
index e6a1d9c62d..476b820d84 100644
--- a/actionview/lib/action_view/helpers/tags/file_field.rb
+++ b/actionview/lib/action_view/helpers/tags/file_field.rb
@@ -2,21 +2,6 @@ module ActionView
   module Helpers
     module Tags # :nodoc:
       class FileField < TextField # :nodoc:
-
-        def render
-          options = @options.stringify_keys
-
-          if options.fetch("include_hidden", true)
-            add_default_name_and_id(options)
-            options[:type] = "file"
-            tag("input", name: options["name"], type: "hidden", value: "") + tag("input", options)
-          else
-            options.delete("include_hidden")
-            @options = options
-
-            super
-          end
-        end
       end
     end
   end
diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb
index 310d0ce514..931f5a3cf2 100644
--- a/actionview/test/template/form_helper_test.rb
+++ b/actionview/test/template/form_helper_test.rb
@@ -528,33 +528,18 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, text_field(object_name, "title")
   end
 
-  def test_file_field_does_generate_a_hidden_field
-    expected = '<input name="user[avatar]" type="hidden" value="" /><input id="user_avatar" name="user[avatar]" type="file" />'
-    assert_dom_equal expected, file_field("user", "avatar")
-  end
-
-  def test_file_field_does_not_generate_a_hidden_field_if_included_hidden_option_is_false
-    expected = '<input id="user_avatar" name="user[avatar]" type="file" />'
-    assert_dom_equal expected, file_field("user", "avatar", include_hidden: false)
-  end
-
-  def test_file_field_does_not_generate_a_hidden_field_if_included_hidden_option_is_false_with_key_as_string
-    expected = '<input id="user_avatar" name="user[avatar]" type="file" />'
-    assert_dom_equal expected, file_field("user", "avatar", "include_hidden" => false)
-  end
-
   def test_file_field_has_no_size
-    expected = '<input name="user[avatar]" type="hidden" value="" /><input id="user_avatar" name="user[avatar]" type="file" />'
+    expected = '<input id="user_avatar" name="user[avatar]" type="file" />'
     assert_dom_equal expected, file_field("user", "avatar")
   end
 
   def test_file_field_with_multiple_behavior
-    expected = '<input name="import[file][]" type="hidden" value="" /><input id="import_file" multiple="multiple" name="import[file][]" type="file" />'
+    expected = '<input id="import_file" multiple="multiple" name="import[file][]" type="file" />'
     assert_dom_equal expected, file_field("import", "file", :multiple => true)
   end
 
   def test_file_field_with_multiple_behavior_and_explicit_name
-    expected = '<input name="custom" type="hidden" value="" /><input id="import_file" multiple="multiple" name="custom" type="file" />'
+    expected = '<input id="import_file" multiple="multiple" name="custom" type="file" />'
     assert_dom_equal expected, file_field("import", "file", :multiple => true, :name => "custom")
   end
 
@@ -1838,7 +1823,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form("/posts/123", "create-post", "edit_post", method: "patch", multipart: true) do
-      "<input name='post[file]' type='hidden' value='' /><input name='post[file]' type='file' id='post_file' />"
+      "<input name='post[file]' type='file' id='post_file' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1854,7 +1839,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form("/posts/123", "edit_post_123", "edit_post", method: "patch", multipart: true) do
-      "<input name='post[comment][file]' type='hidden' value='' /><input name='post[comment][file]' type='file' id='post_comment_file' />"
+      "<input name='post[comment][file]' type='file' id='post_comment_file' />"
     end
 
     assert_dom_equal expected, output_buffer
-- 
cgit v1.2.3