Skip to content

Commit 755dcd0

Browse files
claudiobrafaelfranca
authored andcommitted
Remove deprecated ActionMailer deliver & deliver!
These methods were deprecated in Rails 4.2 (see f4ee114) so they can be safely removed in Rails 5.0.
1 parent 5f777e4 commit 755dcd0

File tree

3 files changed

+4
-39
lines changed

3 files changed

+4
-39
lines changed

actionmailer/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Remove deprecated `deliver` and `deliver!` methods.
2+
3+
*claudiob*
4+
15
* Template lookup now respects default locale and I18n fallbacks.
26

37
Given the following templates:

actionmailer/lib/action_mailer/message_delivery.rb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -85,26 +85,6 @@ def deliver_now
8585
message.deliver
8686
end
8787

88-
def deliver! #:nodoc:
89-
ActiveSupport::Deprecation.warn(<<-MSG.squish)
90-
`#deliver!` is deprecated and will be removed in Rails 5. Use
91-
`#deliver_now!` to deliver immediately or `#deliver_later!` to
92-
deliver through Active Job.
93-
MSG
94-
95-
deliver_now!
96-
end
97-
98-
def deliver #:nodoc:
99-
ActiveSupport::Deprecation.warn(<<-MSG.squish)
100-
`#deliver` is deprecated and will be removed in Rails 5. Use
101-
`#deliver_now` to deliver immediately or `#deliver_later` to
102-
deliver through Active Job.
103-
MSG
104-
105-
deliver_now
106-
end
107-
10888
private
10989

11090
def enqueue_delivery(delivery_method, options={})

actionmailer/test/message_delivery_test.rb

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,6 @@ class MessageDeliveryTest < ActiveSupport::TestCase
3232
assert_equal Mail::Message , @mail.message.class
3333
end
3434

35-
test 'should respond to .deliver' do
36-
assert_respond_to @mail, :deliver
37-
end
38-
39-
test 'should respond to .deliver!' do
40-
assert_respond_to @mail, :deliver!
41-
end
42-
43-
test '.deliver is deprecated' do
44-
assert_deprecated do
45-
@mail.deliver
46-
end
47-
end
48-
test '.deliver! is deprecated' do
49-
assert_deprecated do
50-
@mail.deliver!
51-
end
52-
end
53-
5435
test 'should respond to .deliver_later' do
5536
assert_respond_to @mail, :deliver_later
5637
end

0 commit comments

Comments
 (0)