aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test/integration
diff options
context:
space:
mode:
authorKevin Deisz <kevin.deisz@gmail.com>2015-05-07 18:32:15 -0400
committerKevin Deisz <kevin.deisz@gmail.com>2015-05-07 19:17:22 -0400
commit221a411fd79a25c062100e43423188df5ac4bf2f (patch)
tree81971d73bfcd23b3d6f3041915b7fda559be3240 /activejob/test/integration
parent6d951bda36c60d3d377ef63b22a855fbd2735df3 (diff)
downloadrails-221a411fd79a25c062100e43423188df5ac4bf2f.tar.gz
rails-221a411fd79a25c062100e43423188df5ac4bf2f.tar.bz2
rails-221a411fd79a25c062100e43423188df5ac4bf2f.zip
Provide provider_job_id to qu adapter.
Further work to provide provider_job_id for queue adapters.
Diffstat (limited to 'activejob/test/integration')
-rw-r--r--activejob/test/integration/queuing_test.rb13
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