diff options
Diffstat (limited to 'railties')
-rw-r--r-- | railties/generators/mailer/templates/fixture.rhtml | 3 | ||||
-rw-r--r-- | railties/generators/mailer/templates/mailer.rb | 5 | ||||
-rw-r--r-- | railties/generators/mailer/templates/unit_test.rb | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/railties/generators/mailer/templates/fixture.rhtml b/railties/generators/mailer/templates/fixture.rhtml index f315d430ed..b481906829 100644 --- a/railties/generators/mailer/templates/fixture.rhtml +++ b/railties/generators/mailer/templates/fixture.rhtml @@ -1,4 +1,3 @@ <%= class_name %>#<%= action %> -Find me in test/fixtures/<%= file_name %>/<%= action %>. -I'm tested against the view in app/views/<%= file_name %>/<%= action %>. +Find me in app/views/<%= file_name %>/<%= action %>.rhtml diff --git a/railties/generators/mailer/templates/mailer.rb b/railties/generators/mailer/templates/mailer.rb index 6621ba9a01..d6e8d1691d 100644 --- a/railties/generators/mailer/templates/mailer.rb +++ b/railties/generators/mailer/templates/mailer.rb @@ -4,11 +4,12 @@ class <%= class_name %> < ActionMailer::Base <% for action in actions -%> def <%= action %>(sent_on = Time.now) + @subject = '<%= class_name %>#<%= action %>' + @body = {} @recipients = '' @from = '' - @subject = '' - @body = {} @sent_on = sent_on + @headers = {} end <% end -%> end diff --git a/railties/generators/mailer/templates/unit_test.rb b/railties/generators/mailer/templates/unit_test.rb index 3bf460907f..9b9b436df1 100644 --- a/railties/generators/mailer/templates/unit_test.rb +++ b/railties/generators/mailer/templates/unit_test.rb @@ -10,13 +10,11 @@ class <%= class_name %>Test < Test::Unit::TestCase ActionMailer::Base.deliveries = [] @expected = TMail::Mail.new - @expected.to = 'test@localhost' - @expected.from = 'test@localhost' end <% for action in actions -%> def test_<%= action %> - @expected.subject = '<%= class_name %>#<%= action %> test mail' + @expected.subject = '<%= class_name %>#<%= action %>' @expected.body = read_fixture('<%= action %>') @expected.date = Time.now |