aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@basecamp.com>2014-05-19 13:04:16 +0200
committerDavid Heinemeier Hansson <david@basecamp.com>2014-05-19 13:04:16 +0200
commit60b8af42e929adc397b92877a3274b9bfd110c4b (patch)
tree031bc172e58495e7bbdf253ae6b4bc6c96a243ba
parentf85ad8bdcd3796620d8b03a2dfdf034c6ed43498 (diff)
parentca8b2fd8996d75f8dd3d612f7ea35279e29cb9a9 (diff)
downloadrails-60b8af42e929adc397b92877a3274b9bfd110c4b.tar.gz
rails-60b8af42e929adc397b92877a3274b9bfd110c4b.tar.bz2
rails-60b8af42e929adc397b92877a3274b9bfd110c4b.zip
Merge pull request #16 from seuros/master
Setting the adapter load the required gem.
-rw-r--r--test/adapters/delayed_job.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/adapters/delayed_job.rb b/test/adapters/delayed_job.rb
index c5d9fd37ab..afd9c9deb7 100644
--- a/test/adapters/delayed_job.rb
+++ b/test/adapters/delayed_job.rb
@@ -1,7 +1,7 @@
-require 'delayed_job'
+ActiveJob::Base.queue_adapter = :delayed_job
+
$LOAD_PATH << File.dirname(__FILE__) + "/../support/delayed_job"
Delayed::Worker.delay_jobs = false
Delayed::Worker.backend = :test
-ActiveJob::Base.queue_adapter = :delayed_job