1 files changed, 83 insertions, 34 deletions
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 40f27500a5..1fa68a8ad5 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -1,16 +1,19 @@
-require 'helper'
-require 'jobs/logging_job'
-require 'jobs/hello_job'
-require 'active_support/core_ext/numeric/time'
+# frozen_string_literal: true
+
+require "helper"
+require "jobs/logging_job"
+require "jobs/hello_job"
+require "jobs/provider_jid_job"
+require "active_support/core_ext/numeric/time"
 
 class QueuingTest < ActiveSupport::TestCase
-  test 'should run jobs enqueued on a listening queue' do
+  test "should run jobs enqueued on a listening queue" do
     TestJob.perform_later @id
     wait_for_jobs_to_finish_for(5.seconds)
     assert job_executed
   end
 
-  test 'should not run jobs queued on a non-listening queue' do
+  test "should not run jobs queued on a non-listening queue" do
     skip if adapter_is?(:inline, :async, :sucker_punch, :que)
     old_queue = TestJob.queue_name
 
@@ -24,51 +27,69 @@ class QueuingTest < ActiveSupport::TestCase
     end
   end
 
-  test 'should supply a wrapped class name to Sidekiq' do
+  test "should supply a wrapped class name to Sidekiq" do
     skip unless adapter_is?(:sidekiq)
     Sidekiq::Testing.fake! do
       ::HelloJob.perform_later
       hash = ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper.jobs.first
-      assert_equal "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper", hash['class']
-      assert_equal "HelloJob", hash['wrapped']
+      assert_equal "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper", hash["class"]
+      assert_equal "HelloJob", hash["wrapped"]
     end
   end
 
-  test 'should not run job enqueued in the future' do
-    begin
-      TestJob.set(wait: 10.minutes).perform_later @id
-      wait_for_jobs_to_finish_for(5.seconds)
-      assert_not job_executed
-    rescue NotImplementedError
-      skip
+  test "should access provider_job_id inside Sidekiq job" do
+    skip unless adapter_is?(:sidekiq)
+    Sidekiq::Testing.inline! do
+      job = ::ProviderJidJob.perform_later
+      assert_equal "Provider Job ID: #{job.provider_job_id}", JobBuffer.last_value
     end
   end
 
-  test 'should run job enqueued in the future at the specified time' do
-    begin
-      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)
-      assert job_executed
-    rescue NotImplementedError
-      skip
-    end
+  test "should supply a wrapped class name to DelayedJob" do
+    skip unless adapter_is?(:delayed_job)
+    ::HelloJob.perform_later
+    job = Delayed::Job.first
+    assert_match(/HelloJob \[[0-9a-f-]+\] from DelayedJob\(default\) with arguments: \[\]/, job.name)
+  end
+
+  test "resque JobWrapper should have instance variable queue" do
+    skip unless adapter_is?(:resque)
+    job = ::HelloJob.set(wait: 5.seconds).perform_later
+    hash = Resque.decode(Resque.find_delayed_selection { true }[0])
+    assert_equal hash["queue"], job.queue_name
+  end
+
+  test "should not run job enqueued in the future" do
+    TestJob.set(wait: 10.minutes).perform_later @id
+    wait_for_jobs_to_finish_for(5.seconds)
+    assert_not job_executed
+  rescue NotImplementedError
+    skip
+  end
+
+  test "should run job enqueued in the future at the specified time" do
+    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)
+    assert job_executed
+  rescue NotImplementedError
+    skip
   end
 
-  test 'should supply a provider_job_id when available for immediate jobs' do
-    skip unless adapter_is?(:async, :delayed_job, :sidekiq, :qu, :que, :queue_classic)
+  test "should supply a provider_job_id when available for immediate jobs" do
+    skip unless adapter_is?(:async, :delayed_job, :sidekiq, :que, :queue_classic)
     test_job = TestJob.perform_later @id
-    assert test_job.provider_job_id, 'Provider job id should be set by provider'
+    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
+  test "should supply a provider_job_id when available for delayed jobs" do
     skip unless adapter_is?(:async, :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'
+    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
+  test "current locale is kept while running perform_later" do
     skip if adapter_is?(:inline)
 
     begin
@@ -78,14 +99,30 @@ class QueuingTest < ActiveSupport::TestCase
       TestJob.perform_later @id
       wait_for_jobs_to_finish_for(5.seconds)
       assert job_executed
-      assert_equal 'de', job_executed_in_locale
+      assert_equal "de", job_executed_in_locale
     ensure
       I18n.available_locales = [:en]
       I18n.locale = :en
     end
   end
 
-  test 'should run job with higher priority first' do
+  test "current timezone is kept while running perform_later" do
+    skip if adapter_is?(:inline)
+
+    begin
+      current_zone = Time.zone
+      Time.zone = "Hawaii"
+
+      TestJob.perform_later @id
+      wait_for_jobs_to_finish_for(5.seconds)
+      assert job_executed
+      assert_equal "Hawaii", job_executed_in_timezone
+    ensure
+      Time.zone = current_zone
+    end
+  end
+
+  test "should run job with higher priority first" do
     skip unless adapter_is?(:delayed_job, :que)
 
     wait_until = Time.now + 3.seconds
@@ -96,4 +133,16 @@ class QueuingTest < ActiveSupport::TestCase
     assert job_executed "#{@id}.2"
     assert job_executed_at("#{@id}.2") < job_executed_at("#{@id}.1")
   end
+
+  test "should run job with higher priority first in Backburner" do
+    skip unless adapter_is?(:backburner)
+
+    jobs_manager.tube.pause(3)
+    TestJob.set(priority: 20).perform_later "#{@id}.1"
+    TestJob.set(priority: 10).perform_later "#{@id}.2"
+    wait_for_jobs_to_finish_for(10.seconds)
+    assert job_executed "#{@id}.1"
+    assert job_executed "#{@id}.2"
+    assert job_executed_at("#{@id}.2") < job_executed_at("#{@id}.1")
+  end
 end