diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:38:22 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:38:22 -0300 |
| commit | c78da4d5c472f7254ed609ef753d7b1719732802 (patch) | |
| tree | f04630ac62d08a49744b90bdf20bf75dcb883838 /activejob/test/adapters/delayed_job.rb | |
| parent | 4e4913462104df89f1bee08faeb4ba5aab8c9228 (diff) | |
| parent | 7ee055076ec2c5b2e9c110f821c10fe06bf38a1c (diff) | |
| download | rails-c78da4d5c472f7254ed609ef753d7b1719732802.tar.gz rails-c78da4d5c472f7254ed609ef753d7b1719732802.tar.bz2 rails-c78da4d5c472f7254ed609ef753d7b1719732802.zip | |
Merge branch 'master' into loofah
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'activejob/test/adapters/delayed_job.rb')
| -rw-r--r-- | activejob/test/adapters/delayed_job.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activejob/test/adapters/delayed_job.rb b/activejob/test/adapters/delayed_job.rb new file mode 100644 index 0000000000..afd9c9deb7 --- /dev/null +++ b/activejob/test/adapters/delayed_job.rb @@ -0,0 +1,7 @@ +ActiveJob::Base.queue_adapter = :delayed_job + +$LOAD_PATH << File.dirname(__FILE__) + "/../support/delayed_job" + +Delayed::Worker.delay_jobs = false +Delayed::Worker.backend = :test + |