Skip to content

Commit c3a288b

Browse files
committed
Copy edits on latest patch
1 parent f2cacd5 commit c3a288b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

actionmailer/CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
* Added `deliver_enqueued_emails` to `ActionMailer::TestHelper`. This method
22
delivers all enqueued email jobs.
3-
3+
44
Example:
55

66
```ruby
@@ -12,6 +12,8 @@
1212
end
1313
```
1414

15+
*Andrew Novoselac*
16+
1517
* The `deliver_later_queue_name` used by the default mailer job can now be
1618
configured on a per-mailer basis. Previously this was only configurable
1719
for all mailers via `ActionMailer::Base`.

actionmailer/lib/action_mailer/test_helper.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ def assert_no_enqueued_emails(&block)
216216
# deliver_enqueued_emails do
217217
# ContactMailer.welcome.deliver_later
218218
# end
219+
#
219220
# assert_emails 1
220221
# end
221222
#
@@ -225,7 +226,6 @@ def assert_no_enqueued_emails(&block)
225226
# deliver_enqueued_emails
226227
#
227228
# assert_emails 1
228-
#
229229
# end
230230
#
231231
# If the +:queue+ option is specified,
@@ -238,11 +238,12 @@ def assert_no_enqueued_emails(&block)
238238
# EmployeeMailer.deliver_later_queue_name = :internal_mailers
239239
# EmployeeMailer.welcome.deliver_later # will not be performed
240240
# end
241+
#
241242
# assert_emails 1
242243
# end
243244
#
244245
# If the +:at+ option is specified, then only delivers emails enqueued to deliver
245-
# immediately or before the given time
246+
# immediately or before the given time.
246247
def deliver_enqueued_emails(queue: nil, at: nil, &block)
247248
perform_enqueued_jobs(only: ->(job) { delivery_job_filter(job) }, queue: queue, at: at, &block)
248249
end

0 commit comments

Comments
 (0)