aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test/integration
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-05-07 17:25:49 +0200
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-05-07 21:59:07 +0200
commit29fcbc2ea0dc5ee2d8f512295f2ad3fac83f9941 (patch)
treebe0e093df62add6a96c9860df3895b3f6fb5947f /activejob/test/integration
parent52d131826e46d1a4606b71ddbf57db0f75f040e0 (diff)
downloadrails-29fcbc2ea0dc5ee2d8f512295f2ad3fac83f9941.tar.gz
rails-29fcbc2ea0dc5ee2d8f512295f2ad3fac83f9941.tar.bz2
rails-29fcbc2ea0dc5ee2d8f512295f2ad3fac83f9941.zip
Make que report back its job_id to provider_job_id
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Diffstat (limited to 'activejob/test/integration')
-rw-r--r--activejob/test/integration/queuing_test.rb14
1 files changed, 4 insertions, 10 deletions
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