From ce88f6bd2561f3ff31e39c70ae82b301ee0ddd79 Mon Sep 17 00:00:00 2001 From: Kyle Keesling Date: Thu, 25 Jul 2019 16:24:04 -0400 Subject: Fix filenames of attachments created via the inbound email conductor controller passed along attachment file paths instead of their filenames --- .../rails/conductor/action_mailbox/inbound_emails_controller.rb | 2 +- .../controllers/rails/action_mailbox/inbound_emails_controller_test.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'actionmailbox') diff --git a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb index 8713f545f5..cd8b12dcde 100644 --- a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb +++ b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb @@ -23,7 +23,7 @@ module Rails Mail.new(params.require(:mail).permit(:from, :to, :cc, :bcc, :in_reply_to, :subject, :body).to_h).tap do |mail| mail[:bcc]&.include_in_headers = true params[:mail][:attachments].to_a.each do |attachment| - mail.add_file(filename: attachment.path, content: attachment.read) + mail.add_file(filename: attachment.original_filename, content: attachment.read) end end end diff --git a/actionmailbox/test/controllers/rails/action_mailbox/inbound_emails_controller_test.rb b/actionmailbox/test/controllers/rails/action_mailbox/inbound_emails_controller_test.rb index 6fc39c2433..ad13faf36c 100644 --- a/actionmailbox/test/controllers/rails/action_mailbox/inbound_emails_controller_test.rb +++ b/actionmailbox/test/controllers/rails/action_mailbox/inbound_emails_controller_test.rb @@ -45,8 +45,10 @@ class Rails::Conductor::ActionMailbox::InboundEmailsControllerTest < ActionDispa end mail = ActionMailbox::InboundEmail.last.mail + attachment_filenames = mail.attachments.map(&:filename) assert_equal "Let's talk about these images:", mail.text_part.decoded assert_equal 2, mail.attachments.count + assert_equal attachment_filenames, ["avatar1.jpeg", "avatar2.jpeg"] end end -- cgit v1.2.3