2 files changed, 11 insertions, 10 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index fd5f4e2831..c17e59f746 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -4,6 +4,7 @@ require 'set'
 
 require 'action_dispatch'
 require 'active_support/time'
+require 'active_support/core_ext/object/itself'
 
 require 'mailers/base_mailer'
 require 'mailers/proc_mailer'
@@ -243,7 +244,7 @@ class BaseTest < ActiveSupport::TestCase
       end
     end
 
-    e = assert_raises(RuntimeError) { LateAttachmentMailer.welcome }
+    e = assert_raises(RuntimeError) { LateAttachmentMailer.welcome.message }
     assert_match(/Can't add attachments after `mail` was called./, e.message)
   end
 
@@ -255,7 +256,7 @@ class BaseTest < ActiveSupport::TestCase
       end
     end
 
-    e = assert_raises(RuntimeError) { LateInlineAttachmentMailer.welcome }
+    e = assert_raises(RuntimeError) { LateInlineAttachmentMailer.welcome.message }
     assert_match(/Can't add attachments after `mail` was called./, e.message)
   end
 
diff --git a/actionmailer/test/deliver_later_test.rb b/actionmailer/test/message_delivery_test.rb
index 829c96872f..6ad9b099a3 100644
--- a/actionmailer/test/deliver_later_test.rb
+++ b/actionmailer/test/message_delivery_test.rb
@@ -1,11 +1,11 @@
 # encoding: utf-8
 gem 'activejob'
-require 'action_mailer/deliver_later'
+require 'active_job'
 require 'abstract_unit'
 require 'minitest/mock'
 require_relative 'mailers/delayed_mailer'
 
-class MailerTest < ActiveSupport::TestCase
+class MessageDeliveryTest < ActiveSupport::TestCase
 
   setup do
     @previous_logger = ActiveJob::Base.logger
@@ -21,8 +21,8 @@ class MailerTest < ActiveSupport::TestCase
     ActionMailer::Base.delivery_method = @previous_delivery_method
   end
 
-  test 'should be a MailMessageWrapper' do
-    assert_equal @mail.class, ActionMailer::DeliverLater::MailMessageWrapper
+  test 'should be a MessageDelivery' do
+    assert_equal @mail.class, ActionMailer::MessageDelivery
   end
 
   test 'its object should be a Mail::Message' do
@@ -51,21 +51,21 @@ class MailerTest < ActiveSupport::TestCase
   end
 
   test 'should enqueue the email with :deliver delivery method' do
-    ret = ActionMailer::DeliverLater::Job.stub :enqueue, ->(*args){ args } do
+    ret = ActionMailer::DelayedDeliveryJob.stub :enqueue, ->(*args){ args } do
       @mail.deliver_later
     end
     assert_equal ret, ["DelayedMailer", "test_message", "deliver", 1, 2, 3]
   end
 
   test 'should enqueue the email with :deliver! delivery method' do
-    ret = ActionMailer::DeliverLater::Job.stub :enqueue, ->(*args){ args } do
+    ret = ActionMailer::DelayedDeliveryJob.stub :enqueue, ->(*args){ args } do
       @mail.deliver_later!
     end
     assert_equal ret, ["DelayedMailer", "test_message", "deliver!", 1, 2, 3]
   end
 
   test 'should enqueue a delivery with a delay' do
-    ret = ActionMailer::DeliverLater::Job.stub :enqueue_in, ->(*args){ args } do
+    ret = ActionMailer::DelayedDeliveryJob.stub :enqueue_in, ->(*args){ args } do
       @mail.deliver_later in: 600
     end
     assert_equal ret, [600, "DelayedMailer", "test_message", "deliver", 1, 2, 3]
@@ -73,7 +73,7 @@ class MailerTest < ActiveSupport::TestCase
 
   test 'should enqueue a delivery at a specific time' do
     later_time = Time.now.to_i + 3600
-    ret = ActionMailer::DeliverLater::Job.stub :enqueue_at, ->(*args){ args } do
+    ret = ActionMailer::DelayedDeliveryJob.stub :enqueue_at, ->(*args){ args } do
       @mail.deliver_later at: later_time
     end
     assert_equal ret, [later_time, "DelayedMailer", "test_message", "deliver", 1, 2, 3]