Prevent reading inline attachments after mail was called from raising an inaccurate exception

Without this change, `attachments.inline['my_attachment'].present?`, for example,
would raise the exception `Can't add attachments after mail was called`.

I first brought this issue up at https://github.com/rails/rails/issues/16163#issuecomment-437378347.

Note that this commit addresses only one of the 2 problems I described in that comment.
The other problem is that using `attachments.inline['my_attachment']` for reading an
attachment is unnecessary--it's the same as `attachments['my_attachment']`--even before
`mail` is called.  We could add a warning about the unnecessary use of `inline` but I'm
saving that for a later PR since my comment has not received any feedback yet.
This commit is contained in:
Isaac Betesh 2019-05-09 12:38:58 -07:00
parent 973096b6ae
commit efeddb08da
2 changed files with 12 additions and 1 deletions

@ -738,7 +738,7 @@ def attachments
end
class LateAttachmentsProxy < SimpleDelegator
def inline; _raise_error end
def inline; self end
def []=(_name, _content); _raise_error end
private

@ -267,6 +267,17 @@ def welcome
assert_match(/Can't add attachments after `mail` was called./, e.message)
end
test "accessing inline attachments after mail was called works" do
class LateInlineAttachmentMailer < ActionMailer::Base
def welcome
mail body: "yay", from: "welcome@example.com", to: "to@example.com"
attachments.inline["invoice.pdf"]
end
end
assert_nothing_raised { LateInlineAttachmentMailer.welcome.message }
end
test "adding inline attachments while rendering mail works" do
class LateInlineAttachmentMailer < ActionMailer::Base
def on_render