1 files changed, 31 insertions, 4 deletions
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index af19a92118..125ba54302 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)
+    skip if adapter_is?(:inline, :async, :sucker_punch, :que)
     old_queue = TestJob.queue_name
 
     begin
@@ -26,8 +26,6 @@ class QueuingTest < ActiveSupport::TestCase
 
   test 'should supply a wrapped class name to Sidekiq' do
     skip unless adapter_is?(:sidekiq)
-    require 'sidekiq/testing'
-
     Sidekiq::Testing.fake! do
       ::HelloJob.perform_later
       hash = ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper.jobs.first
@@ -48,7 +46,7 @@ class QueuingTest < ActiveSupport::TestCase
 
   test 'should run job enqueued in the future at the specified time' do
     begin
-      TestJob.set(wait: 3.seconds).perform_later @id
+      TestJob.set(wait: 5.seconds).perform_later @id
       wait_for_jobs_to_finish_for(2.seconds)
       assert_not job_executed
       wait_for_jobs_to_finish_for(10.seconds)
@@ -57,4 +55,33 @@ class QueuingTest < ActiveSupport::TestCase
       skip
     end
   end
+
+  test 'should supply a provider_job_id when available for immediate jobs' do
+    skip unless adapter_is?(:delayed_job, :sidekiq, :qu, :que, :queue_classic)
+    test_job = TestJob.perform_later @id
+    assert test_job.provider_job_id, '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, :queue_classic)
+    delayed_test_job = TestJob.set(wait: 1.minute).perform_later @id
+    assert delayed_test_job.provider_job_id, 'Provider job id should by set for delayed jobs by provider'
+  end
+
+  test 'current locale is kept while running perform_later' do
+    skip if adapter_is?(:inline)
+
+    begin
+      I18n.available_locales = [:en, :de]
+      I18n.locale = :de
+
+      TestJob.perform_later @id
+      wait_for_jobs_to_finish_for(5.seconds)
+      assert job_executed
+      assert_equal 'de', job_output
+    ensure
+      I18n.available_locales = [:en]
+      I18n.locale = :en
+    end
+  end
 end