3 files changed, 14 insertions, 5 deletions
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
index d8944a5338..637096e935 100644
--- a/activejob/CHANGELOG.md
+++ b/activejob/CHANGELOG.md
@@ -1,6 +1,11 @@
+*   Implement `provider_job_id` for `queue_classic` adapter. This requires the
+    latest, currently unreleased, version of queue_classic.
+
+    *Yves Senn*
+
 *   `assert_enqueued_with` and `assert_performed_with` now returns the matched
     job instance for further assertions.
-    
+
     *Jean Boussier*
 
 *   Include I18n.locale into job serialization/deserialization and use it around
diff --git a/activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb b/activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb
index 059754a87f..0ee41407d8 100644
--- a/activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb
@@ -18,7 +18,9 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :queue_classic
     class QueueClassicAdapter
       def enqueue(job) #:nodoc:
-        build_queue(job.queue_name).enqueue("#{JobWrapper.name}.perform", job.serialize)
+        qc_job = build_queue(job.queue_name).enqueue("#{JobWrapper.name}.perform", job.serialize)
+        job.provider_job_id = qc_job["id"] if qc_job.is_a?(Hash)
+        qc_job
       end
 
       def enqueue_at(job, timestamp) #:nodoc:
@@ -28,7 +30,9 @@ module ActiveJob
             'the QC::Queue needs to respond to `enqueue_at(timestamp, method, *args)`. ' \
             'You can implement this yourself or you can use the queue_classic-later gem.'
         end
-        queue.enqueue_at(timestamp, "#{JobWrapper.name}.perform", job.serialize)
+        qc_job = queue.enqueue_at(timestamp, "#{JobWrapper.name}.perform", job.serialize)
+        job.provider_job_id = qc_job["id"] if qc_job.is_a?(Hash)
+        qc_job
       end
 
       # Builds a <tt>QC::Queue</tt> object to schedule jobs on.
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 1d1e675435..ca8047ef0b 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -57,13 +57,13 @@ class QueuingTest < ActiveSupport::TestCase
   end
 
   test 'should supply a provider_job_id when available for immediate jobs' do
-    skip unless adapter_is?(:delayed_job, :sidekiq, :qu, :que)
+    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)
+    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