diff options
| author | Brian Cardarella <brian@dockyard.com> | 2016-08-12 21:24:46 -0400 |
|---|---|---|
| committer | Brian Cardarella <brian@dockyard.com> | 2016-08-12 21:24:46 -0400 |
| commit | 16a257d4d0176dacf186e90eeb4ff1a37e1660af (patch) | |
| tree | cdf641acf1ca536cf9eaac5479c0ceafa5bc1654 | |
| parent | afdc2bcc4360197d31ca1d0dc08c14741ce9ca8e (diff) | |
| download | rails-16a257d4d0176dacf186e90eeb4ff1a37e1660af.tar.gz rails-16a257d4d0176dacf186e90eeb4ff1a37e1660af.tar.bz2 rails-16a257d4d0176dacf186e90eeb4ff1a37e1660af.zip | |
Ensure app/mailers is removed when skipping action-mailer
Closes #26145
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index bc666b9812..a1b1649547 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -324,6 +324,7 @@ module Rails remove_file "app/mailers/application_mailer.rb" remove_file "app/views/layouts/mailer.html.erb" remove_file "app/views/layouts/mailer.text.erb" + remove_dir "app/mailers" end end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 969c2df718..3b149d6cf9 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -380,6 +380,7 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "config/environments/production.rb" do |content| assert_no_match(/config\.action_mailer/, content) end + assert_no_directory "app/mailers" end def test_generator_has_assets_gems |