Merge pull request #22764 from stevenspiel/titleize_model_name_for_default_submit_button_value

titleize the model name on default submit buttons

3 files changed, 43 insertions, 3 deletions

diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb
index 2a367b85af..b43d99ebb7 100644
--- a/actionview/lib/action_view/helpers/form_helper.rb
+++ b/actionview/lib/action_view/helpers/form_helper.rb
@@ -1922,6 +1922,8 @@ module ActionView
             @object_name.to_s.humanize
           end
 
+          model = model.downcase
+
           defaults = []
           defaults << :"helpers.submit.#{object_name}.#{key}"
           defaults << :"helpers.submit.#{key}"
diff --git a/actionview/test/lib/controller/fake_models.rb b/actionview/test/lib/controller/fake_models.rb
index 65c68fc34a..a3e7e4d980 100644
--- a/actionview/test/lib/controller/fake_models.rb
+++ b/actionview/test/lib/controller/fake_models.rb
@@ -31,6 +31,26 @@ end
 class GoodCustomer < Customer
 end
 
+class TicketType < Struct.new(:name)
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+  extend ActiveModel::Translation
+
+  def initialize(*args)
+    super
+  end
+
+  def persisted=(boolean)
+    @persisted = boolean
+  end
+
+  def persisted?
+    @persisted
+  end
+
+  attr_accessor :name
+end
+
 class Post < Struct.new(:title, :author_name, :body, :secret, :persisted, :written_on, :cost)
   extend ActiveModel::Naming
   include ActiveModel::Conversion
diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb
index bd40fa06ac..1be1c68c14 100644
--- a/actionview/test/template/form_helper_test.rb
+++ b/actionview/test/template/form_helper_test.rb
@@ -128,6 +128,8 @@ class FormHelperTest < ActionView::TestCase
     @post_delegator.title = 'Hello World'
 
     @car = Car.new("#000FFF")
+
+    @ticket_type = TicketType.new
   end
 
   Routes = ActionDispatch::Routing::RouteSet.new
@@ -136,6 +138,8 @@ class FormHelperTest < ActionView::TestCase
       resources :comments
     end
 
+    resources :ticket_types
+
     namespace :admin do
       resources :posts do
         resources :comments
@@ -1872,6 +1876,20 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_lowercase_model_name_default_submit_button_value
+    form_for(@ticket_type) do |f|
+      concat f.submit
+    end
+
+    expected =
+      '<form class="new_ticket_type" id="new_ticket_type" action="/ticket_types" accept-charset="UTF-8" method="post">' +
+        hidden_fields +
+        '<input type="submit" name="commit" value="Create ticket type" data-disable-with="Create ticket type" />' +
+      '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_form_for_with_symbol_object_name
     form_for(@post, as: "other_name", html: { id: "create-post" }) do |f|
       concat f.label(:title, class: 'post_title')
@@ -2239,7 +2257,7 @@ class FormHelperTest < ActionView::TestCase
         end
 
         expected = whole_form('/posts', 'new_post', 'new_post') do
-          "<input name='commit' data-disable-with='Create Post' type='submit' value='Create Post' />"
+          "<input name='commit' data-disable-with='Create post' type='submit' value='Create post' />"
         end
 
         assert_dom_equal expected, output_buffer
@@ -2254,7 +2272,7 @@ class FormHelperTest < ActionView::TestCase
       end
 
       expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
-      "<input name='commit' data-disable-with='Confirm Post changes' type='submit' value='Confirm Post changes' />"
+      "<input name='commit' data-disable-with='Confirm post changes' type='submit' value='Confirm post changes' />"
       end
 
       assert_dom_equal expected, output_buffer
@@ -2282,7 +2300,7 @@ class FormHelperTest < ActionView::TestCase
       end
 
       expected = whole_form('/posts/123', 'edit_another_post', 'edit_another_post', method: 'patch') do
-      "<input name='commit' data-disable-with='Update your Post' type='submit' value='Update your Post' />"
+      "<input name='commit' data-disable-with='Update your post' type='submit' value='Update your post' />"
       end
 
       assert_dom_equal expected, output_buffer