aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-09-13 15:09:15 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-09-14 14:10:00 -0700
commit8577687fcb9da20868a5ea50aea36427270d4485 (patch)
tree51fa7cb8e0e153da58a9c65d39a862d7ee7a6c2b /actionmailer/test
parentae00adecf420703bd13f52ffad23eb417b2cf244 (diff)
downloadrails-8577687fcb9da20868a5ea50aea36427270d4485.tar.gz
rails-8577687fcb9da20868a5ea50aea36427270d4485.tar.bz2
rails-8577687fcb9da20868a5ea50aea36427270d4485.zip
Move queue classes to ActiveSupport
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/abstract_unit.rb4
-rw-r--r--actionmailer/test/base_test.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 1167387def..0b418c4ea1 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -11,7 +11,7 @@ end
require 'minitest/autorun'
require 'action_mailer'
require 'action_mailer/test_case'
-require 'rails/queueing'
+require 'active_support/queueing'
silence_warnings do
# These external dependencies have warnings :/
@@ -27,7 +27,7 @@ ActionView::Template.register_template_handler :bak, lambda { |template| "Lame b
FIXTURE_LOAD_PATH = File.expand_path('fixtures', File.dirname(__FILE__))
ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
-ActionMailer::Base.queue = Rails::Queueing::SynchronousQueue.new
+ActionMailer::Base.queue = ActiveSupport::SynchronousQueue.new
class MockSMTP
def self.deliveries
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 862b954f9e..6a06cec041 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -3,13 +3,13 @@ require 'abstract_unit'
require 'set'
require 'action_dispatch'
+require 'active_support/queueing'
require 'active_support/time'
require 'mailers/base_mailer'
require 'mailers/proc_mailer'
require 'mailers/asset_mailer'
require 'mailers/async_mailer'
-require 'rails/queueing'
class BaseTest < ActiveSupport::TestCase
def teardown
@@ -433,7 +433,7 @@ class BaseTest < ActiveSupport::TestCase
end
test "delivering message asynchronously" do
- testing_queue = Rails::Queueing::TestQueue.new
+ testing_queue = ActiveSupport::TestQueue.new
AsyncMailer.delivery_method = :test
AsyncMailer.deliveries.clear
stub_queue(AsyncMailer, testing_queue).welcome.deliver