diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2019-06-20 17:32:53 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-20 17:32:53 +0900 |
| commit | defd6c411e04df58672e28f70f76c455a8f6a97e (patch) | |
| tree | 848296ebbb5e840c7cff680c3347c62e1ec61ca6 /actionmailbox | |
| parent | bf625f7fecabbcda22b388e088ad5c29016b2385 (diff) | |
| parent | aab9f6734d1027ee5ee49c150f3e7b264e801a82 (diff) | |
| download | rails-defd6c411e04df58672e28f70f76c455a8f6a97e.tar.gz rails-defd6c411e04df58672e28f70f76c455a8f6a97e.tar.bz2 rails-defd6c411e04df58672e28f70f76c455a8f6a97e.zip | |
Merge pull request #36523 from y-yagi/include_bcc_in_mail_sent_from_development_page
Include BCC in the mail that sent from the development page
Diffstat (limited to 'actionmailbox')
| -rw-r--r-- | actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb | 1 | ||||
| -rw-r--r-- | actionmailbox/test/controllers/rails/action_mailbox/inbound_emails_controller_test.rb | 2 |
2 files changed, 3 insertions, 0 deletions
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 d051dfe665..8713f545f5 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 @@ -21,6 +21,7 @@ module Rails private def new_mail 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) 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 fcd9ad839f..1b8ca7bd5e 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 @@ -10,6 +10,7 @@ class Rails::Conductor::ActionMailbox::InboundEmailsControllerTest < ActionDispa mail: { from: "Jason Fried <jason@37signals.com>", to: "Replies <replies@example.com>", + bcc: "Bcc <bcc@example.com>", in_reply_to: "<4e6e35f5a38b4_479f13bb90078178@small-app-01.mail>", subject: "Hey there", body: "How's it going?" @@ -20,6 +21,7 @@ class Rails::Conductor::ActionMailbox::InboundEmailsControllerTest < ActionDispa mail = ActionMailbox::InboundEmail.last.mail assert_equal %w[ jason@37signals.com ], mail.from assert_equal %w[ replies@example.com ], mail.to + assert_equal %w[ bcc@example.com ], mail.bcc assert_equal "4e6e35f5a38b4_479f13bb90078178@small-app-01.mail", mail.in_reply_to assert_equal "Hey there", mail.subject assert_equal "How's it going?", mail.body.decoded |