From 18303f6e82258c1d6175f1faf1becd260397fb57 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Wed, 13 Aug 2014 21:50:38 +0000 Subject: Refactor DeliverLater into MessageDelivery --- actionmailer/test/base_test.rb | 5 +- actionmailer/test/deliver_later_test.rb | 82 ------------------------------ actionmailer/test/message_delivery_test.rb | 82 ++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 84 deletions(-) delete mode 100644 actionmailer/test/deliver_later_test.rb create mode 100644 actionmailer/test/message_delivery_test.rb (limited to 'actionmailer/test') 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/deliver_later_test.rb deleted file mode 100644 index 829c96872f..0000000000 --- a/actionmailer/test/deliver_later_test.rb +++ /dev/null @@ -1,82 +0,0 @@ -# encoding: utf-8 -gem 'activejob' -require 'action_mailer/deliver_later' -require 'abstract_unit' -require 'minitest/mock' -require_relative 'mailers/delayed_mailer' - -class MailerTest < ActiveSupport::TestCase - - setup do - @previous_logger = ActiveJob::Base.logger - @previous_delivery_method = ActionMailer::Base.delivery_method - ActionMailer::Base.delivery_method = :test - ActiveJob::Base.logger = Logger.new('/dev/null') - @mail = DelayedMailer.test_message(1, 2, 3) - ActionMailer::Base.deliveries.clear - end - - teardown do - ActiveJob::Base.logger = @previous_logger - ActionMailer::Base.delivery_method = @previous_delivery_method - end - - test 'should be a MailMessageWrapper' do - assert_equal @mail.class, ActionMailer::DeliverLater::MailMessageWrapper - end - - test 'its object should be a Mail::Message' do - assert_equal @mail.__getobj__.class, Mail::Message - end - - test 'should respond to .deliver' do - assert_respond_to @mail, :deliver - end - - test 'should respond to .deliver!' do - assert_respond_to @mail, :deliver! - end - - test 'should respond to .deliver_later' do - assert_respond_to @mail, :deliver_later - end - - test 'should respond to .deliver_later!' do - assert_respond_to @mail, :deliver_later! - end - - test 'should enqueue and run correctly in activejob' do - @mail.deliver_later! - assert_equal ActionMailer::Base.deliveries.size, 1 - end - - test 'should enqueue the email with :deliver delivery method' do - ret = ActionMailer::DeliverLater::Job.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 - @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 - @mail.deliver_later in: 600 - end - assert_equal ret, [600, "DelayedMailer", "test_message", "deliver", 1, 2, 3] - end - - 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 - @mail.deliver_later at: later_time - end - assert_equal ret, [later_time, "DelayedMailer", "test_message", "deliver", 1, 2, 3] - end - -end diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb new file mode 100644 index 0000000000..6ad9b099a3 --- /dev/null +++ b/actionmailer/test/message_delivery_test.rb @@ -0,0 +1,82 @@ +# encoding: utf-8 +gem 'activejob' +require 'active_job' +require 'abstract_unit' +require 'minitest/mock' +require_relative 'mailers/delayed_mailer' + +class MessageDeliveryTest < ActiveSupport::TestCase + + setup do + @previous_logger = ActiveJob::Base.logger + @previous_delivery_method = ActionMailer::Base.delivery_method + ActionMailer::Base.delivery_method = :test + ActiveJob::Base.logger = Logger.new('/dev/null') + @mail = DelayedMailer.test_message(1, 2, 3) + ActionMailer::Base.deliveries.clear + end + + teardown do + ActiveJob::Base.logger = @previous_logger + ActionMailer::Base.delivery_method = @previous_delivery_method + end + + test 'should be a MessageDelivery' do + assert_equal @mail.class, ActionMailer::MessageDelivery + end + + test 'its object should be a Mail::Message' do + assert_equal @mail.__getobj__.class, Mail::Message + end + + test 'should respond to .deliver' do + assert_respond_to @mail, :deliver + end + + test 'should respond to .deliver!' do + assert_respond_to @mail, :deliver! + end + + test 'should respond to .deliver_later' do + assert_respond_to @mail, :deliver_later + end + + test 'should respond to .deliver_later!' do + assert_respond_to @mail, :deliver_later! + end + + test 'should enqueue and run correctly in activejob' do + @mail.deliver_later! + assert_equal ActionMailer::Base.deliveries.size, 1 + end + + test 'should enqueue the email with :deliver delivery method' 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::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::DelayedDeliveryJob.stub :enqueue_in, ->(*args){ args } do + @mail.deliver_later in: 600 + end + assert_equal ret, [600, "DelayedMailer", "test_message", "deliver", 1, 2, 3] + end + + test 'should enqueue a delivery at a specific time' do + later_time = Time.now.to_i + 3600 + 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] + end + +end -- cgit v1.2.3