From 67f8b6b2bc7e7eca8723996b1303c3fafa5ed39b Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Tue, 12 Aug 2014 18:24:19 +0000 Subject: Added ActionMailer::DeliverLater --- actionmailer/test/deliver_later_test.rb | 82 +++++++++++++++++++++++++++++ actionmailer/test/mailers/delayed_mailer.rb | 6 +++ 2 files changed, 88 insertions(+) create mode 100644 actionmailer/test/deliver_later_test.rb create mode 100644 actionmailer/test/mailers/delayed_mailer.rb (limited to 'actionmailer/test') diff --git a/actionmailer/test/deliver_later_test.rb b/actionmailer/test/deliver_later_test.rb new file mode 100644 index 0000000000..829c96872f --- /dev/null +++ b/actionmailer/test/deliver_later_test.rb @@ -0,0 +1,82 @@ +# 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/mailers/delayed_mailer.rb b/actionmailer/test/mailers/delayed_mailer.rb new file mode 100644 index 0000000000..62d4baa434 --- /dev/null +++ b/actionmailer/test/mailers/delayed_mailer.rb @@ -0,0 +1,6 @@ +class DelayedMailer < ActionMailer::Base + + def test_message(*) + mail(from: 'test-sender@test.com', to: 'test-receiver@test.com', subject: 'Test Subject', body: 'Test Body') + end +end -- cgit v1.2.3 From bc116a55ca3dd9f63a1f1ca7ade3623885adcc57 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Wed, 13 Aug 2014 18:26:41 +0900 Subject: AM, AP, AV, and AMo tests are already order_independent! --- actionmailer/test/abstract_unit.rb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 1281b1bcfc..98d266bd73 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -51,8 +51,3 @@ def jruby_skip(message = '') end require 'mocha/setup' # FIXME: stop using mocha - -# FIXME: we have tests that depend on run order, we should fix that and -# remove this method call. -require 'active_support/test_case' -ActiveSupport::TestCase.my_tests_are_order_dependent! -- cgit v1.2.3 From 2ef0d3bea622ad8d61b2b2f47451ff0c9604637d Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Wed, 13 Aug 2014 22:29:30 +0900 Subject: actionmailer_tests_are_order_dependent! --- actionmailer/test/abstract_unit.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actionmailer/test') diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 98d266bd73..1281b1bcfc 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -51,3 +51,8 @@ def jruby_skip(message = '') end require 'mocha/setup' # FIXME: stop using mocha + +# FIXME: we have tests that depend on run order, we should fix that and +# remove this method call. +require 'active_support/test_case' +ActiveSupport::TestCase.my_tests_are_order_dependent! -- cgit v1.2.3 From e9ce987a9a6fdad436b5511874963e8485b66f84 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Wed, 13 Aug 2014 16:00:19 +0200 Subject: use :test delivery method for `base_test.rb` This solves errors like: ``` BaseTest#test_you_can_register_multiple_observers_to_the_mail_object_that_both_get_informed_on_email_delivery: Errno::ECONNREFUSED: Connection refused - connect(2) for "localhost" port 25 /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `initialize' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `open' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `tcp_socket' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:551:in `block in do_start' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:91:in `block in timeout' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:101:in `call' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:101:in `timeout' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:550:in `do_start' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:520:in `start' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/network/delivery_methods/smtp.rb:112:in `deliver!' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:2136:in `do_delivery' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:232:in `block in deliver' /Users/senny/Projects/rails/actionmailer/lib/action_mailer/base.rb:528:in `block in deliver_mail' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:164:in `block in instrument' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications/instrumenter.rb:20:in `instrument' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:164:in `instrument' /Users/senny/Projects/rails/actionmailer/lib/action_mailer/base.rb:526:in `deliver_mail' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:232:in `deliver' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:598:in `block (2 levels) in ' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:801:in `mail_side_effects' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:593:in `block in ' ``` where the `:smtp` delivery method was leaked over to other test cases. --- actionmailer/test/abstract_unit.rb | 5 ----- actionmailer/test/base_test.rb | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 1281b1bcfc..98d266bd73 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -51,8 +51,3 @@ def jruby_skip(message = '') end require 'mocha/setup' # FIXME: stop using mocha - -# FIXME: we have tests that depend on run order, we should fix that and -# remove this method call. -require 'active_support/test_case' -ActiveSupport::TestCase.my_tests_are_order_dependent! diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 6116d1e29f..fd5f4e2831 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -11,6 +11,8 @@ require 'mailers/asset_mailer' class BaseTest < ActiveSupport::TestCase setup do + @original_delivery_method = ActionMailer::Base.delivery_method + ActionMailer::Base.delivery_method = :test @original_asset_host = ActionMailer::Base.asset_host @original_assets_dir = ActionMailer::Base.assets_dir end @@ -19,6 +21,7 @@ class BaseTest < ActiveSupport::TestCase ActionMailer::Base.asset_host = @original_asset_host ActionMailer::Base.assets_dir = @original_assets_dir BaseMailer.deliveries.clear + ActionMailer::Base.delivery_method = @original_delivery_method end test "method call to mail does not raise error" do @@ -468,7 +471,6 @@ class BaseTest < ActiveSupport::TestCase end test "calling deliver on the action should increment the deliveries collection if using the test mailer" do - BaseMailer.delivery_method = :test BaseMailer.welcome.deliver assert_equal(1, BaseMailer.deliveries.length) end -- cgit v1.2.3 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 From 6a2ca149fda46c8a36d80e0f95affb1b6de11aae Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Thu, 14 Aug 2014 23:33:40 +0000 Subject: [ActiveJob] Fix test syntax --- actionmailer/test/message_delivery_test.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb index 6ad9b099a3..49958081f5 100644 --- a/actionmailer/test/message_delivery_test.rb +++ b/actionmailer/test/message_delivery_test.rb @@ -11,7 +11,7 @@ class MessageDeliveryTest < ActiveSupport::TestCase @previous_logger = ActiveJob::Base.logger @previous_delivery_method = ActionMailer::Base.delivery_method ActionMailer::Base.delivery_method = :test - ActiveJob::Base.logger = Logger.new('/dev/null') + ActiveJob::Base.logger = Logger.new(nil) @mail = DelayedMailer.test_message(1, 2, 3) ActionMailer::Base.deliveries.clear end @@ -21,12 +21,12 @@ class MessageDeliveryTest < ActiveSupport::TestCase ActionMailer::Base.delivery_method = @previous_delivery_method end - test 'should be a MessageDelivery' do - assert_equal @mail.class, ActionMailer::MessageDelivery + test 'should have a message' do + assert @mail.message end - test 'its object should be a Mail::Message' do - assert_equal @mail.__getobj__.class, Mail::Message + test 'its message should be a Mail::Message' do + assert_equal Mail::Message , @mail.message.class end test 'should respond to .deliver' do @@ -47,28 +47,28 @@ class MessageDeliveryTest < ActiveSupport::TestCase test 'should enqueue and run correctly in activejob' do @mail.deliver_later! - assert_equal ActionMailer::Base.deliveries.size, 1 + assert_equal 1 , ActionMailer::Base.deliveries.size 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] + assert_equal ['DelayedMailer', 'test_message', 'deliver', 1, 2, 3], ret 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] + assert_equal ['DelayedMailer', 'test_message', 'deliver!', 1, 2, 3], ret 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] + assert_equal [600, 'DelayedMailer', 'test_message', 'deliver', 1, 2, 3], ret end test 'should enqueue a delivery at a specific time' do @@ -76,7 +76,7 @@ class MessageDeliveryTest < ActiveSupport::TestCase 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] + assert_equal [later_time, 'DelayedMailer', 'test_message', 'deliver', 1, 2, 3], ret end end -- cgit v1.2.3 From 299d1f262629aaa25e070db6ae15438e95137054 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Thu, 14 Aug 2014 23:47:38 +0000 Subject: [ActionMailer] Rename ActionMailer::DelayedDeliveryJob to ActionMailer::DeliveryJob --- actionmailer/test/message_delivery_test.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb index 49958081f5..a097d0e84d 100644 --- a/actionmailer/test/message_delivery_test.rb +++ b/actionmailer/test/message_delivery_test.rb @@ -51,21 +51,21 @@ class MessageDeliveryTest < ActiveSupport::TestCase end test 'should enqueue the email with :deliver delivery method' do - ret = ActionMailer::DelayedDeliveryJob.stub :enqueue, ->(*args){ args } do + ret = ActionMailer::DeliveryJob.stub :enqueue, ->(*args){ args } do @mail.deliver_later end assert_equal ['DelayedMailer', 'test_message', 'deliver', 1, 2, 3], ret end test 'should enqueue the email with :deliver! delivery method' do - ret = ActionMailer::DelayedDeliveryJob.stub :enqueue, ->(*args){ args } do + ret = ActionMailer::DeliveryJob.stub :enqueue, ->(*args){ args } do @mail.deliver_later! end assert_equal ['DelayedMailer', 'test_message', 'deliver!', 1, 2, 3], ret end test 'should enqueue a delivery with a delay' do - ret = ActionMailer::DelayedDeliveryJob.stub :enqueue_in, ->(*args){ args } do + ret = ActionMailer::DeliveryJob.stub :enqueue_in, ->(*args){ args } do @mail.deliver_later in: 600 end assert_equal [600, 'DelayedMailer', 'test_message', 'deliver', 1, 2, 3], ret @@ -73,7 +73,7 @@ class MessageDeliveryTest < ActiveSupport::TestCase 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 + ret = ActionMailer::DeliveryJob.stub :enqueue_at, ->(*args){ args } do @mail.deliver_later at: later_time end assert_equal [later_time, 'DelayedMailer', 'test_message', 'deliver', 1, 2, 3], ret -- cgit v1.2.3 From 2f7b239fca6630e49ba8ad9df6fc7db25e1080f0 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Sun, 17 Aug 2014 01:06:30 +0000 Subject: [ActiveJob] Use globalid gem --- actionmailer/test/base_test.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index c17e59f746..fc24639bf4 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -4,7 +4,6 @@ require 'set' require 'action_dispatch' require 'active_support/time' -require 'active_support/core_ext/object/itself' require 'mailers/base_mailer' require 'mailers/proc_mailer' -- cgit v1.2.3