aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2014-05-19 11:00:00 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2014-05-19 11:00:00 +0200
commit935f53bd5ad2d71cfa18a91514184eea3fb83690 (patch)
tree8fdf1182ba54e6e699a4bdf7bfced4f98aa1f087
parentdc20f7d4d40648e9a5af999a6436a5130ddad607 (diff)
downloadrails-935f53bd5ad2d71cfa18a91514184eea3fb83690.tar.gz
rails-935f53bd5ad2d71cfa18a91514184eea3fb83690.tar.bz2
rails-935f53bd5ad2d71cfa18a91514184eea3fb83690.zip
Fix for the new adapter setter
-rw-r--r--test/adapters/delayed_job.rb2
-rw-r--r--test/cases/adapter_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/adapters/delayed_job.rb b/test/adapters/delayed_job.rb
index 2055a6b6e6..f334437a9e 100644
--- a/test/adapters/delayed_job.rb
+++ b/test/adapters/delayed_job.rb
@@ -3,4 +3,4 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../support/delayed_job"
Delayed::Worker.delay_jobs = false
Delayed::Worker.backend = :test
-ActiveJob::Base.adapter = :delayed_job
+ActiveJob::Base.queue_adapter = :delayed_job
diff --git a/test/cases/adapter_test.rb b/test/cases/adapter_test.rb
index cdc601b06a..05efdc33e9 100644
--- a/test/cases/adapter_test.rb
+++ b/test/cases/adapter_test.rb
@@ -26,7 +26,7 @@ class AdapterTest < ActiveSupport::TestCase
end
test 'should load delayed_job adapter' do
- ActiveJob::Base.adapter = :delayed_job
+ ActiveJob::Base.queue_adapter = :delayed_job
assert_equal ActiveJob::QueueAdapters::DelayedJobAdapter, ActiveJob::Base.queue_adapter
end