diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2015-01-08 08:55:07 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2015-01-08 22:21:54 +0900 |
| commit | af3eb5961e55a46b011be797e71f615f20f56686 (patch) | |
| tree | 2c3329ce51dc71eeb8ae36f319f30add1b07279a /railties/lib/rails/generators/erb | |
| parent | 9892d445bcff57f0a8bd8eb467cb7bf8c40a285b (diff) | |
| download | rails-af3eb5961e55a46b011be797e71f615f20f56686.tar.gz rails-af3eb5961e55a46b011be797e71f615f20f56686.tar.bz2 rails-af3eb5961e55a46b011be797e71f615f20f56686.zip | |
follow up to #18074
* ignore mailer suffix when generate test files
* add mailer suffix to view files
Diffstat (limited to 'railties/lib/rails/generators/erb')
| -rw-r--r-- | railties/lib/rails/generators/erb/mailer/mailer_generator.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb index 7d27321610..65563aa6db 100644 --- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb @@ -6,7 +6,7 @@ module Erb # :nodoc: argument :actions, type: :array, default: [], banner: "method method" def copy_view_files - view_base_path = File.join("app/views", class_path, file_name) + view_base_path = File.join("app/views", class_path, file_name + '_mailer') empty_directory view_base_path if self.behavior == :invoke @@ -31,6 +31,10 @@ module Erb # :nodoc: def formats [:text, :html] end + + def file_name + @_file_name ||= super.gsub(/\_mailer/i, '') + end end end end |