Merge pull request rails#43886 from seanpdoyle/form-builder-button-method-name-id

Generate `[id]` for `FormBuilder#button` called with method name

Author: rafaelfranca

Diff for: actionview/lib/action_view/helpers/form_helper.rb

@@ -2587,7 +2587,7 @@ def submit(value = nil, options = {})
       #   # => <button name='button' type='submit'>Create post</button>
       #
       #   button(:draft, value: true)
-      #   # => <button name="post[draft]" value="true" type="submit">Create post</button>
+      #   # => <button id="post_draft" name="post[draft]" value="true" type="submit">Create post</button>
       #
       #   button do
       #     content_tag(:strong, 'Ask me!')
@@ -2606,7 +2606,7 @@ def submit(value = nil, options = {})
       #   button(:draft, value: true) do
       #     content_tag(:strong, "Save as draft")
       #   end
-      #   # =>  <button name="post[draft]" value="true" type="submit">
+      #   # =>  <button id="post_draft" name="post[draft]" value="true" type="submit">
       #   #       <strong>Save as draft</strong>
       #   #     </button>
       #
@@ -2615,7 +2615,7 @@ def button(value = nil, options = {}, &block)
         when Hash
           value, options = nil, value
         when Symbol
-          value, options[:name] = nil, field_name(value)
+          value, options = nil, { name: field_name(value), id: field_id(value) }.merge!(options.to_h)
         end
         value ||= submit_default_value
 

Diff for: actionview/test/template/form_helper_test.rb

@@ -2607,7 +2607,19 @@ def test_button_with_method_name
     end
 
     expected = whole_form("/posts/123", "edit_post_123", "edit_post", method: "patch") do
-      %(<button type="submit" name="post[secret]" value="true">Update Post</button>)
+      %(<button type="submit" id="post_secret" name="post[secret]" value="true">Update Post</button>)
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_button_with_method_name_and_attributes
+    form_for(@post) do |f|
+      concat f.button(:secret, value: true, id: "not_generated", name: "post[not_generated]")
+    end
+
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", method: "patch") do
+      %(<button type="submit" id="not_generated" name="post[not_generated]" value="true">Update Post</button>)
     end
 
     assert_dom_equal expected, output_buffer
@@ -2619,7 +2631,7 @@ def test_button_with_method_name_and_block
     end
 
     expected = whole_form("/posts/123", "edit_post_123", "edit_post", method: "patch") do
-      %(<button type="submit" name="post[secret]" value="true">Update secret Post</button>)
+      %(<button type="submit" id="post_secret" name="post[secret]" value="true">Update secret Post</button>)
     end
 
     assert_dom_equal expected, output_buffer