Include app name in layout title

c44cacb0 · Jeremy Kemper · ea6a67cb · c44cacb0 · c44cacb0 · c44cacb0
3 changed file
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -78,7 +78,12 @@ def create_root_files
    end

    def create_app_files
-      directory "app"
+      directory "app/controllers"
+      directory "app/helpers"
+      directory "app/models"
+      inside "app/views/layouts" do
+        template "application.html.erb"
+      end
    end

    def create_config_files

--- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb
+++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb
 <!DOCTYPE html>
 <html>
 <head>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
-  <%= csrf_meta_tag %>
+  <title><%= app_const_base %></title>
+  <%%= stylesheet_link_tag :all %>
+  <%%= javascript_include_tag :defaults %>
+  <%%= csrf_meta_tag %>
 </head>
 <body>

-<%= yield %>
+<%%= yield %>

 </body>
 </html>
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -54,8 +54,8 @@ def test_application_skeleton_is_created
  def test_application_controller_and_layout_files
    run_generator
    assert_file "app/controllers/application_controller.rb", /layout 'application'/
-    assert_file "app/views/layouts/application.html.erb", /stylesheet_link_tag 'application'/
-    assert_file "public/stylesheets/application.css"
+    assert_file "app/views/layouts/application.html.erb", /stylesheet_link_tag :all/
+    assert_no_file "public/stylesheets/application.css"
  end

  def test_name_collision_raises_an_error