diff options
| author | Joshua Peek <josh@joshpeek.com> | 2012-10-15 10:20:50 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2012-10-15 10:20:50 -0500 |
| commit | c800e27ad35ec46f32b5ac4428e5cf7141f95105 (patch) | |
| tree | 0821e0afaba2a74dec6ea1397ee3cabfd3d10c59 /railties/test/application/initializers/frameworks_test.rb | |
| parent | 7dba1599d9092a8362956a3fab23b2c60eedea63 (diff) | |
| parent | 46dc6e7786222865309d15a9eaaaf55e3b7d9c1f (diff) | |
| download | rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.gz rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.bz2 rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.zip | |
Merge branch 'master' into asset-path-helper
Conflicts:
railties/test/application/configuration_test.rb
Diffstat (limited to 'railties/test/application/initializers/frameworks_test.rb')
| -rw-r--r-- | railties/test/application/initializers/frameworks_test.rb | 5 |
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 |