From 221a411fd79a25c062100e43423188df5ac4bf2f Mon Sep 17 00:00:00 2001 From: Kevin Deisz Date: Thu, 7 May 2015 18:32:15 -0400 Subject: Provide provider_job_id to qu adapter. Further work to provide provider_job_id for queue adapters. --- activejob/test/integration/queuing_test.rb | 13 ++++++++----- activejob/test/support/integration/test_case_helpers.rb | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'activejob/test') 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 diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb index bed28b2900..7e87ede275 100644 --- a/activejob/test/support/integration/test_case_helpers.rb +++ b/activejob/test/support/integration/test_case_helpers.rb @@ -27,8 +27,8 @@ module TestCaseHelpers jobs_manager.clear_jobs end - def adapter_is?(adapter_class_symbol) - ActiveJob::Base.queue_adapter.class.name.split("::").last.gsub(/Adapter$/, '').underscore == adapter_class_symbol.to_s + def adapter_is?(*adapter_class_symbols) + adapter_class_symbols.map(&:to_s).include?(ActiveJob::Base.queue_adapter.class.name.split("::").last.gsub(/Adapter$/, '').underscore) end def wait_for_jobs_to_finish_for(seconds=60) -- cgit v1.2.3