3 files changed, 1 insertions, 26 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 575c1ed1d9..ddbcd4c394 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -617,7 +617,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     run_generator
     folders_with_keep = %w(
       app/assets/images
-      app/mailers
       app/controllers/concerns
       app/models/concerns
       lib/tasks
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index f01e8cd2d9..f8d9ccacb4 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -14,15 +14,6 @@ class MailerGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_application_mailer_skeleton_is_created
-    run_generator
-    assert_file "app/mailers/application_mailer.rb" do |mailer|
-      assert_match(/class ApplicationMailer < ActionMailer::Base/, mailer)
-      assert_match(/default from: "from@example.com"/, mailer)
-      assert_match(/layout 'mailer'/, mailer)
-    end
-  end
-
   def test_mailer_with_i18n_helper
     run_generator
     assert_file "app/mailers/notifier_mailer.rb" do |mailer|
@@ -87,10 +78,6 @@ class MailerGeneratorTest < Rails::Generators::TestCase
       assert_match(%r(\sapp/views/notifier_mailer/bar\.text\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
-
-    assert_file "app/views/layouts/mailer.text.erb" do |view|
-      assert_match(/<%= yield %>/, view)
-    end
   end
 
   def test_invokes_default_html_template_engine
@@ -104,17 +91,11 @@ class MailerGeneratorTest < Rails::Generators::TestCase
       assert_match(%r(\sapp/views/notifier_mailer/bar\.html\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
-
-    assert_file "app/views/layouts/mailer.html.erb" do |view|
-      assert_match(%r{<html>\n  <body>\n    <%= yield %>\n  </body>\n</html>}, view)
-    end
   end
 
   def test_invokes_default_template_engine_even_with_no_action
     run_generator ["notifier"]
     assert_file "app/views/notifier_mailer"
-    assert_file "app/views/layouts/mailer.text.erb"
-    assert_file "app/views/layouts/mailer.html.erb"
   end
 
   def test_logs_if_the_template_engine_cannot_be_found
@@ -162,10 +143,6 @@ class MailerGeneratorTest < Rails::Generators::TestCase
     assert_no_file "app/views/notifier/bar.text.erb"
     assert_no_file "app/views/notifier/foo.html.erb"
     assert_no_file "app/views/notifier/bar.html.erb"
-
-    assert_file "app/mailers/application_mailer.rb"
-    assert_file "app/views/layouts/mailer.text.erb"
-    assert_file "app/views/layouts/mailer.html.erb"
   end
 
   def test_mailer_suffix_is_not_duplicated
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index acb78ec888..e83d54890a 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -144,7 +144,6 @@ module SharedGeneratorTests
   def test_skip_git
     run_generator [destination_root, '--skip-git', '--full']
     assert_no_file('.gitignore')
-    assert_file('app/mailers/.keep')
   end
 
   def test_skip_keeps
@@ -154,6 +153,6 @@ module SharedGeneratorTests
       assert_no_match(/\.keep/, content)
     end
 
-    assert_no_file('app/mailers/.keep')
+    assert_no_file('app/models/concerns/.keep')
   end
 end