aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application/initializers
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-12 18:01:04 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-12 19:38:40 -0700
commit775829869e23666e114edbe8d6d3ff08d5d71025 (patch)
tree3bfbcee2dace0d1fa842682a4443384a63beaa88 /railties/test/application/initializers
parent32b4d464849d976431342aa0cfe2d4e17b10e9f0 (diff)
downloadrails-775829869e23666e114edbe8d6d3ff08d5d71025.tar.gz
rails-775829869e23666e114edbe8d6d3ff08d5d71025.tar.bz2
rails-775829869e23666e114edbe8d6d3ff08d5d71025.zip
Remove the queue container. Premature consolidation. Set up and maintain queues in the classes that use them instead.
Diffstat (limited to 'railties/test/application/initializers')
-rw-r--r--railties/test/application/initializers/frameworks_test.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 81f6096be8..528bec58ef 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -52,14 +52,13 @@ module ApplicationTests
test "uses the default queue for ActionMailer" do
require "#{app_path}/config/environment"
- assert_kind_of ActiveSupport::QueueContainer, ActionMailer::Base.queue
+ assert_kind_of ActiveSupport::Queue, ActionMailer::Base.queue
end
test "allows me to configure queue for ActionMailer" do
app_file "config/environments/development.rb", <<-RUBY
AppTemplate::Application.configure do
- Rails.queue[:mailer] = ActiveSupport::TestQueue.new
- config.action_mailer.queue = Rails.queue[:mailer]
+ config.action_mailer.queue = ActiveSupport::TestQueue.new
end
RUBY