diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-08 15:13:05 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-08 15:13:05 -0300 |
commit | fca8a7a7ba4047d3843219f9403c059f40fe0de2 (patch) | |
tree | 2c4055f11ebe7d134d04a08d3eb4a1e4ce5960dc /activejob/test/integration/queuing_test.rb | |
parent | 7b975c54d1e8c70bfeb82b15303ab18204de7b33 (diff) | |
parent | 221a411fd79a25c062100e43423188df5ac4bf2f (diff) | |
download | rails-fca8a7a7ba4047d3843219f9403c059f40fe0de2.tar.gz rails-fca8a7a7ba4047d3843219f9403c059f40fe0de2.tar.bz2 rails-fca8a7a7ba4047d3843219f9403c059f40fe0de2.zip |
Merge pull request #20064 from kddeisz/qu_provider_job_id
Provide provider_job_id to qu adapter.
Diffstat (limited to 'activejob/test/integration/queuing_test.rb')
-rw-r--r-- | activejob/test/integration/queuing_test.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb index 14fdfa59f0..d345092dee 100644 --- a/activejob/test/integration/queuing_test.rb +++ b/activejob/test/integration/queuing_test.rb @@ -11,7 +11,7 @@ class QueuingTest < ActiveSupport::TestCase end test 'should not run jobs queued on a non-listening queue' do - skip if adapter_is?(:inline) || adapter_is?(:sucker_punch) || adapter_is?(:que) + skip if adapter_is?(:inline, :sucker_punch, :que) old_queue = TestJob.queue_name begin @@ -56,13 +56,16 @@ class QueuingTest < ActiveSupport::TestCase end end - test 'should supply a provider_job_id when available' do - skip unless adapter_is?(:sidekiq) || adapter_is?(:que) || adapter_is?(:delayed_job) + test 'should supply a provider_job_id when available for immediate jobs' do + skip unless adapter_is?(:delayed_job, :sidekiq, :qu, :que) test_job = TestJob.perform_later @id - refute test_job.provider_job_id.nil?, "Provider job id should be set by provider" + refute test_job.provider_job_id.nil?, 'Provider job id should be set by provider' + end + test 'should supply a provider_job_id when available for delayed jobs' do + skip unless adapter_is?(:delayed_job, :sidekiq, :que) delayed_test_job = TestJob.set(wait: 1.minute).perform_later @id refute delayed_test_job.provider_job_id.nil?, - "Provider job id should by set for delayed jobs by provider" + 'Provider job id should by set for delayed jobs by provider' end end |