Add a default yield :head to layouts/application.html.erb (#50527)

* Add a default yield :head Good pattern that most applications should be using. * Make test more resilient * Appease RuboCop
rails · Jan 2, 2024 · c57b2cd · c57b2cd
1 parent ad2354e
commit c57b2cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -6,9 +6,12 @@
     <%%= csrf_meta_tags %>
     <%%= csp_meta_tag %>
 
+    <%%= yield :head %>
     <%- if options[:skip_hotwire] || options[:skip_javascript] -%>
+
     <%%= stylesheet_link_tag "application" %>
     <%- else -%>
+
     <%%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
     <%- end -%>
   </head>

diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
@@ -182,8 +182,7 @@ class Hello
     end
 
     def test_code_statistics
-      assert_match "Code LOC: 63     Test LOC: 5     Code to Test Ratio: 1:0.1",
-        rails("stats")
+      assert_match(/Code LOC: \d+\s+Test LOC: \d+\s+ Code to Test Ratio: 1:\w+/, rails("stats"))
     end
 
     def test_loading_specific_fixtures