Default sent_on time to now in ActionMailer
Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2607 state:committed]
This commit is contained in:
parent
98450fd168
commit
5fdc33c1a3
@ -556,6 +556,7 @@ def initialize_defaults(method_name)
|
||||
@headers ||= {}
|
||||
@body ||= {}
|
||||
@mime_version = @@default_mime_version.dup if @@default_mime_version
|
||||
@sent_on ||= Time.now
|
||||
end
|
||||
|
||||
def render_template(template, body)
|
||||
|
@ -18,7 +18,6 @@ def signed_up(recipient)
|
||||
@recipients = recipient
|
||||
@subject = "[Signed up] Welcome #{recipient}"
|
||||
@from = "system@loudthinking.com"
|
||||
@sent_on = Time.local(2004, 12, 12)
|
||||
@body["recipient"] = recipient
|
||||
end
|
||||
|
||||
@ -357,12 +356,14 @@ def test_attachment_with_custom_header
|
||||
end
|
||||
|
||||
def test_signed_up
|
||||
Time.stubs(:now => Time.now)
|
||||
|
||||
expected = new_mail
|
||||
expected.to = @recipient
|
||||
expected.subject = "[Signed up] Welcome #{@recipient}"
|
||||
expected.body = "Hello there, \n\nMr. #{@recipient}"
|
||||
expected.from = "system@loudthinking.com"
|
||||
expected.date = Time.local(2004, 12, 12)
|
||||
expected.date = Time.now
|
||||
|
||||
created = nil
|
||||
assert_nothing_raised { created = TestMailer.create_signed_up(@recipient) }
|
||||
|
Loading…
Reference in New Issue
Block a user