From 29fcbc2ea0dc5ee2d8f512295f2ad3fac83f9941 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Thu, 7 May 2015 17:25:49 +0200 Subject: Make que report back its job_id to provider_job_id Signed-off-by: Jeroen van Baarsen --- activejob/test/integration/queuing_test.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'activejob/test/integration') diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb index f2665221b8..14fdfa59f0 100644 --- a/activejob/test/integration/queuing_test.rb +++ b/activejob/test/integration/queuing_test.rb @@ -56,19 +56,13 @@ class QueuingTest < ActiveSupport::TestCase end end - test 'should supply a provider_job_id to DelayedJob' do - skip unless adapter_is?(:delayed_job) + test 'should supply a provider_job_id when available' do + skip unless adapter_is?(:sidekiq) || adapter_is?(:que) || adapter_is?(:delayed_job) test_job = TestJob.perform_later @id - assert_kind_of Fixnum, test_job.provider_job_id - end - - test 'should supply a provider_job_id to Sidekiq' do - skip unless adapter_is?(:sidekiq) - test_job = TestJob.perform_later @id - refute test_job.provider_job_id.nil?, "Provider job id should be set by Sidekiq" + refute test_job.provider_job_id.nil?, "Provider job id should be set by provider" 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 sidekiq" + "Provider job id should by set for delayed jobs by provider" end end -- cgit v1.2.3