Skip to content

Commit

Permalink
Remove mention about receive.action_mailer from the AS instrumentat…
Browse files Browse the repository at this point in the history
…ion guide

Since e3f832a `ActionMailer::Base.receive` is
deprecated.
  • Loading branch information
bogdanvlviv committed Dec 28, 2018
1 parent e4b6495 commit 2e29488
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 29 deletions.
7 changes: 4 additions & 3 deletions actionmailer/test/log_subscriber_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
require "abstract_unit"
require "mailers/base_mailer"
require "active_support/log_subscriber/test_helper"
require "active_support/testing/stream"
require "action_mailer/log_subscriber"

class AMLogSubscriberTest < ActionMailer::TestCase
include ActiveSupport::LogSubscriber::TestHelper, ActiveSupport::Testing::Stream
include ActiveSupport::LogSubscriber::TestHelper

def setup
super
Expand Down Expand Up @@ -54,7 +53,9 @@ def test_deliver_message_when_perform_deliveries_is_false

def test_receive_is_notified
fixture = File.read(File.expand_path("fixtures/raw_email", __dir__))
silence_stream(STDERR) { TestMailer.receive(fixture) }
assert_deprecated do
TestMailer.receive(fixture)
end
wait
assert_equal(1, @logger.logged(:info).size)
assert_match(/Received mail/, @logger.logged(:info).first)
Expand Down
26 changes: 0 additions & 26 deletions guides/source/active_support_instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -291,32 +291,6 @@ INFO. The adapters will add their own data as well.
Action Mailer
-------------

### receive.action_mailer

| Key | Value |
| ------------- | -------------------------------------------- |
| `:mailer` | Name of the mailer class |
| `:message_id` | ID of the message, generated by the Mail gem |
| `:subject` | Subject of the mail |
| `:to` | To address(es) of the mail |
| `:from` | From address of the mail |
| `:bcc` | BCC addresses of the mail |
| `:cc` | CC addresses of the mail |
| `:date` | Date of the mail |
| `:mail` | The encoded form of the mail |

```ruby
{
mailer: "Notification",
message_id: "[email protected]",
subject: "Rails Guides",
to: ["[email protected]", "[email protected]"],
from: ["[email protected]"],
date: Sat, 10 Mar 2012 14:18:09 +0100,
mail: "..." # omitted for brevity
}
```

### deliver.action_mailer

| Key | Value |
Expand Down

0 comments on commit 2e29488

Please sign in to comment.