mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #34984 from takeyuweb/fix-actionmailbox-create-inbound-emails 

Fix that adding attachments lose a body
This commit is contained in:
George Claghorn 2019-01-19 11:18:32 -05:00 committed by GitHub
parent 9608b180bf 88453093d5
commit c2c10f9262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
View File

@ -22,7 +22,7 @@ module Rails
def new_mail
Mail.new(params.require(:mail).permit(:from, :to, :cc, :bcc, :in_reply_to, :subject, :body).to_h).tap do |mail|
params[:mail][:attachments].to_a.each do |attachment|
mail.attachments[attachment.original_filename] = { filename: attachment.path, content_type: attachment.content_type }
mail.add_file(filename: attachment.path, content: attachment.read)
end
end
end

23
actionmailbox/test/controllers/rails/action_mailbox/inbound_emails_controller_test.rb
View File

@ -4,6 +4,25 @@ require "test_helper"
class Rails::Conductor::ActionMailbox::InboundEmailsControllerTest < ActionDispatch::IntegrationTest
test "create inbound email" do
with_rails_env("development") do
assert_difference -> { ActionMailbox::InboundEmail.count }, +1 do
post rails_conductor_inbound_emails_path, params: {
mail: {
from: "Jason Fried <jason@37signals.com>",
to: "Replies <replies@example.com>",
bcc: "",
in_reply_to: "<4e6e35f5a38b4_479f13bb90078178@small-app-01.mail>",
subject: "Create",
body: "New Mail"
}
}
end
assert_equal "New Mail", ActionMailbox::InboundEmail.last.mail.decoded
end
end
test "create inbound email with attachments" do
with_rails_env("development") do
assert_difference -> { ActionMailbox::InboundEmail.count }, +1 do
post rails_conductor_inbound_emails_path, params: {
@ -19,7 +38,9 @@ class Rails::Conductor::ActionMailbox::InboundEmailsControllerTest < ActionDispa
}
end
assert_equal 2, ActionMailbox::InboundEmail.last.mail.attachments.size
mail = ActionMailbox::InboundEmail.last.mail
assert_equal 2, mail.attachments.size
assert_equal "Let's talk about these images:", mail.text_part.decoded
end
end