14 files changed, 59 insertions, 35 deletions
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
index 1c55c1a4b8..c523723fc4 100644
--- a/activejob/CHANGELOG.md
+++ b/activejob/CHANGELOG.md
@@ -1,10 +1,17 @@
+*   Allow `DelayedJob`, `Sidekiq`, `qu`, and `que` to report the job id back to
+    `ActiveJob::Base` as `provider_job_id`.
+
+    Fixes #18821.
+
+    *Kevin Deisz*, *Jeroen van Baarsen*
+
 *   `assert_enqueued_jobs` and `assert_performed_jobs` in block form use the
     given number as expected value. This makes the error message much easier to
     understand.
 
     *y-yagi*
 
-*   A generated job now inherents from `app/jobs/application_job.rb` by default.
+*   A generated job now inherits from `app/jobs/application_job.rb` by default.
 
     *Jeroen van Baarsen*
 
diff --git a/activejob/README.md b/activejob/README.md
index 5170ebee6e..f9a3183b1a 100644
--- a/activejob/README.md
+++ b/activejob/README.md
@@ -102,7 +102,7 @@ see the API Documentation for [ActiveJob::QueueAdapters](http://api.rubyonrails.
 The latest version of Active Job can be installed with RubyGems:
 
 ```
-  % [sudo] gem install activejob
+  % gem install activejob
 ```
 
 Source code can be downloaded as part of the Rails project on GitHub
diff --git a/activejob/Rakefile b/activejob/Rakefile
index 0e36bb81b3..8c86df3c91 100644
--- a/activejob/Rakefile
+++ b/activejob/Rakefile
@@ -1,5 +1,4 @@
 require 'rake/testtask'
-require 'rubygems/package_task'
 
 ACTIVEJOB_ADAPTERS = %w(inline delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner test)
 ACTIVEJOB_ADAPTERS -= %w(queue_classic) if defined?(JRUBY_VERSION)
@@ -74,17 +73,3 @@ def run_without_aborting(tasks)
 
   abort "Errors running #{errors.join(', ')}" if errors.any?
 end
-
-
-spec = eval(File.read('activejob.gemspec'))
-
-Gem::PackageTask.new(spec) do |p|
-  p.gem_spec = spec
-end
-
-desc 'Release to rubygems'
-task release: :package do
-  require 'rake/gemcutter'
-  Rake::Gemcutter::Tasks.new(spec).define
-  Rake::Task['gem:push'].invoke
-end
diff --git a/activejob/lib/active_job/core.rb b/activejob/lib/active_job/core.rb
index acdfcdc791..0528572cd0 100644
--- a/activejob/lib/active_job/core.rb
+++ b/activejob/lib/active_job/core.rb
@@ -17,6 +17,9 @@ module ActiveJob
 
       # Queue in which the job will reside.
       attr_writer :queue_name
+
+      # ID optionally provided by adapter
+      attr_accessor :provider_job_id
     end
 
     # These methods will be included into any Active Job object, adding
diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb
index 9c4519432d..457015b741 100644
--- a/activejob/lib/active_job/queue_adapter.rb
+++ b/activejob/lib/active_job/queue_adapter.rb
@@ -4,7 +4,7 @@ require 'active_support/core_ext/string/inflections'
 
 module ActiveJob
   # The <tt>ActiveJob::QueueAdapter</tt> module is used to load the
-  # correct adapter. The default queue adapter is the :inline queue.
+  # correct adapter. The default queue adapter is the +:inline+ queue.
   module QueueAdapter #:nodoc:
     extend ActiveSupport::Concern
 
@@ -15,12 +15,14 @@ module ActiveJob
 
     # Includes the setter method for changing the active queue adapter.
     module ClassMethods
+      # Returns the backend queue provider. The default queue adapter
+      # is the +:inline+ queue. See QueueAdapters for more information.
       def queue_adapter
         _queue_adapter
       end
 
       # Specify the backend queue provider. The default queue adapter
-      # is the :inline queue. See QueueAdapters for more
+      # is the +:inline+ queue. See QueueAdapters for more
       # information.
       def queue_adapter=(name_or_adapter_or_class)
         self._queue_adapter = interpret_adapter(name_or_adapter_or_class)
diff --git a/activejob/lib/active_job/queue_adapters.rb b/activejob/lib/active_job/queue_adapters.rb
index bd69e525bb..1335e3236e 100644
--- a/activejob/lib/active_job/queue_adapters.rb
+++ b/activejob/lib/active_job/queue_adapters.rb
@@ -116,6 +116,10 @@ module ActiveJob
     private_constant :ADAPTER
 
     class << self
+      # Returns adapter for specified name.
+      #
+      #   ActiveJob::QueueAdapters.lookup(:sidekiq)
+      #   # => ActiveJob::QueueAdapters::SidekiqAdapter
       def lookup(name)
         const_get(name.to_s.camelize << ADAPTER)
       end
diff --git a/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb b/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb
index 852a6ee326..ac83da2b9c 100644
--- a/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb
@@ -14,11 +14,15 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :delayed_job
     class DelayedJobAdapter
       def enqueue(job) #:nodoc:
-        Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name)
+        delayed_job = Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name)
+        job.provider_job_id = delayed_job.id
+        delayed_job
       end
 
       def enqueue_at(job, timestamp) #:nodoc:
-        Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name, run_at: Time.at(timestamp))
+        delayed_job = Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name, run_at: Time.at(timestamp))
+        job.provider_job_id = delayed_job.id
+        delayed_job
       end
 
       class JobWrapper #:nodoc:
diff --git a/activejob/lib/active_job/queue_adapters/qu_adapter.rb b/activejob/lib/active_job/queue_adapters/qu_adapter.rb
index 36f4c14911..0e198922fc 100644
--- a/activejob/lib/active_job/queue_adapters/qu_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/qu_adapter.rb
@@ -17,9 +17,13 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :qu
     class QuAdapter
       def enqueue(job, *args) #:nodoc:
-        Qu::Payload.new(klass: JobWrapper, args: [job.serialize]).tap do |payload|
+        qu_job = Qu::Payload.new(klass: JobWrapper, args: [job.serialize]).tap do |payload|
           payload.instance_variable_set(:@queue, job.queue_name)
         end.push
+        
+        # qu_job can be nil depending on the configured backend
+        job.provider_job_id = qu_job.id unless qu_job.nil?
+        qu_job
       end
 
       def enqueue_at(job, timestamp, *args) #:nodoc:
diff --git a/activejob/lib/active_job/queue_adapters/que_adapter.rb b/activejob/lib/active_job/queue_adapters/que_adapter.rb
index a1a41ccc32..90947aa98d 100644
--- a/activejob/lib/active_job/queue_adapters/que_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/que_adapter.rb
@@ -16,11 +16,15 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :que
     class QueAdapter
       def enqueue(job) #:nodoc:
-        JobWrapper.enqueue job.serialize
+        que_job = JobWrapper.enqueue job.serialize
+        job.provider_job_id = que_job.attrs["job_id"]
+        que_job
       end
 
       def enqueue_at(job, timestamp) #:nodoc:
-        JobWrapper.enqueue job.serialize, run_at: Time.at(timestamp)
+        que_job = JobWrapper.enqueue job.serialize, run_at: Time.at(timestamp)
+        job.provider_job_id = que_job.attrs["job_id"]
+        que_job
       end
 
       class JobWrapper < Que::Job #:nodoc:
diff --git a/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb b/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb
index 743d5ea333..c321776bf5 100644
--- a/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb
@@ -17,7 +17,7 @@ module ActiveJob
     class SidekiqAdapter
       def enqueue(job) #:nodoc:
         #Sidekiq::Client does not support symbols as keys
-        Sidekiq::Client.push \
+        job.provider_job_id = Sidekiq::Client.push \
           'class'   => JobWrapper,
           'wrapped' => job.class.to_s,
           'queue'   => job.queue_name,
@@ -25,7 +25,7 @@ module ActiveJob
       end
 
       def enqueue_at(job, timestamp) #:nodoc:
-        Sidekiq::Client.push \
+        job.provider_job_id = Sidekiq::Client.push \
           'class'   => JobWrapper,
           'wrapped' => job.class.to_s,
           'queue'   => job.queue_name,
diff --git a/activejob/test/cases/test_case_test.rb b/activejob/test/cases/test_case_test.rb
index 0a3a20d5a0..ee816e1dd5 100644
--- a/activejob/test/cases/test_case_test.rb
+++ b/activejob/test/cases/test_case_test.rb
@@ -5,11 +5,11 @@ require 'jobs/nested_job'
 
 class ActiveJobTestCaseTest < ActiveJob::TestCase
   # this tests that this job class doesn't get its adapter set.
-  # that's the correct behaviour since we don't want to break
-  # the `class_attribute` inheritence
-  class TestClassAttributeInheritenceJob < ActiveJob::Base
+  # that's the correct behavior since we don't want to break
+  # the `class_attribute` inheritance
+  class TestClassAttributeInheritanceJob < ActiveJob::Base
     def self.queue_adapter=(*)
-      raise 'Attemping to break `class_attribute` inheritence, bad!'
+      raise 'Attemping to break `class_attribute` inheritance, bad!'
     end
   end
 
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index 72ec2b8904..57907042d9 100644
--- a/activejob/test/helper.rb
+++ b/activejob/test/helper.rb
@@ -14,5 +14,3 @@ else
 end
 
 require 'active_support/testing/autorun'
-
-ActiveSupport::TestCase.test_order = :random
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 96794ffef3..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
@@ -55,4 +55,17 @@ 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)
+    test_job = TestJob.perform_later @id
+    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'
+  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)