diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-08-13 02:01:36 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-13 02:01:36 -0300 |
| commit | 6107a40c0e4d05614493bddf33d5ae8d9ce8a8d2 (patch) | |
| tree | cdf641acf1ca536cf9eaac5479c0ceafa5bc1654 /railties | |
| parent | afdc2bcc4360197d31ca1d0dc08c14741ce9ca8e (diff) | |
| parent | 16a257d4d0176dacf186e90eeb4ff1a37e1660af (diff) | |
| download | rails-6107a40c0e4d05614493bddf33d5ae8d9ce8a8d2.tar.gz rails-6107a40c0e4d05614493bddf33d5ae8d9ce8a8d2.tar.bz2 rails-6107a40c0e4d05614493bddf33d5ae8d9ce8a8d2.zip | |
Merge pull request #26146 from bcardarella/bc-clean-up-action-mailer-dirs
Ensure app/mailers is removed when skipping action-mailer
Diffstat (limited to 'railties')
| -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 |