diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt | 4 | ||||
| -rw-r--r-- | railties/test/application/queue_test.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt index 202fc98adf..fe2820f64e 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt @@ -34,6 +34,6 @@ # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr - # Use the testing queue. - config.queue = ActiveSupport::TestQueue + # Use the synchronous queue to run jobs immediately. + config.queue = ActiveSupport::SynchronousQueue end diff --git a/railties/test/application/queue_test.rb b/railties/test/application/queue_test.rb index e67c6cc371..5e7b938cbb 100644 --- a/railties/test/application/queue_test.rb +++ b/railties/test/application/queue_test.rb @@ -17,10 +17,10 @@ module ApplicationTests @app_const ||= Class.new(Rails::Application) end - test "the queue is a TestQueue in test mode" do + test "the queue is a SynchronousQueue in test mode" do app("test") - assert_kind_of ActiveSupport::TestQueue, Rails.application.queue[:default] - assert_kind_of ActiveSupport::TestQueue, Rails.queue[:default] + assert_kind_of ActiveSupport::SynchronousQueue, Rails.application.queue[:default] + assert_kind_of ActiveSupport::SynchronousQueue, Rails.queue[:default] end test "the queue is a SynchronousQueue in development mode" do |