diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-18 19:05:07 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-18 19:05:07 -0200 |
| commit | 39c936b7605ac90c7e9643792cfe891a2d1afbf3 (patch) | |
| tree | c9d3eeaae5b9d98e6b9bf3b27add9f99e5b8a4f4 /railties/lib/rails/generators/test_unit | |
| parent | 3c750c4c6c4d3c2e67865bc43a99010fa8b6c7a6 (diff) | |
| parent | af3eb5961e55a46b011be797e71f615f20f56686 (diff) | |
| download | rails-39c936b7605ac90c7e9643792cfe891a2d1afbf3.tar.gz rails-39c936b7605ac90c7e9643792cfe891a2d1afbf3.tar.bz2 rails-39c936b7605ac90c7e9643792cfe891a2d1afbf3.zip | |
Merge pull request #18393 from y-yagi/fix_mailer
follow up to #18074
Diffstat (limited to 'railties/lib/rails/generators/test_unit')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb | 5 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb index ba131da79d..343c8a3949 100644 --- a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb @@ -16,6 +16,11 @@ module TestUnit # :nodoc: def create_preview_files template "preview.rb", File.join('test/mailers/previews', class_path, "#{file_name}_mailer_preview.rb") end + + protected + def file_name + @_file_name ||= super.gsub(/\_mailer/i, '') + end end end end diff --git a/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb index 3cee517db3..a2f2d30de5 100644 --- a/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb +++ b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb @@ -4,7 +4,7 @@ require 'test_helper' class <%= class_name %>MailerTest < ActionMailer::TestCase <% actions.each do |action| -%> test "<%= action %>" do - mail = <%= class_name %>.<%= action %> + mail = <%= class_name %>Mailer.<%= action %> assert_equal <%= action.to_s.humanize.inspect %>, mail.subject assert_equal ["to@example.org"], mail.to assert_equal ["from@example.com"], mail.from |