Merge pull request #44734 from sidonath/update-que_adapter

Update ActiveJob `QueAdapter` for future compatibility

Gemfile.lock

@@ -390,7 +390,7 @@ GEM
     public_suffix (4.0.6)
     puma (5.5.2)
       nio4r (~> 2.0)
-    que (1.0.0)
+    que (1.3.1)
     queue_classic (4.0.0.pre.beta1)
       pg (>= 0.17, < 2.0)
     raabro (1.4.0)

activejob/CHANGELOG.md

@@ -1,3 +1,10 @@
+*   Update `ActiveJob::QueueAdapters::QueAdapter` te remove deprecation warning
+
+    Remove a deprecation warning introduced in que 1.2 to prepare for changes in
+    que 2.0 necessary for Ruby 3 compatibility.
+
+    *Damir Zekic* and *Adis Hasovic*
+
 *   Add missing `bigdecimal` require in `ActiveJob::Arguments`
 
     Could cause `uninitialized constant ActiveJob::Arguments::BigDecimal (NameError)`

activejob/lib/active_job/queue_adapters/que_adapter.rb

@@ -18,22 +18,44 @@ module QueueAdapters
     #   Rails.application.config.active_job.queue_adapter = :que
     class QueAdapter
       def enqueue(job) # :nodoc:
-        que_job = JobWrapper.enqueue job.serialize, priority: job.priority, queue: job.queue_name
+        job_options = { priority: job.priority, queue: job.queue_name }
+        que_job = nil
+
+        if require_job_options_kwarg?
+          que_job = JobWrapper.enqueue job.serialize, job_options: job_options
+        else
+          que_job = JobWrapper.enqueue job.serialize, **job_options
+        end
+
         job.provider_job_id = que_job.attrs["job_id"]
         que_job
       end
 
       def enqueue_at(job, timestamp) # :nodoc:
-        que_job = JobWrapper.enqueue job.serialize, priority: job.priority, queue: job.queue_name, run_at: Time.at(timestamp)
+        job_options = { priority: job.priority, queue: job.queue_name, run_at: Time.at(timestamp) }
+        que_job = nil
+
+        if require_job_options_kwarg?
+          que_job = JobWrapper.enqueue job.serialize, job_options: job_options
+        else
+          que_job = JobWrapper.enqueue job.serialize, **job_options
+        end
+
         job.provider_job_id = que_job.attrs["job_id"]
         que_job
       end
 
-      class JobWrapper < Que::Job # :nodoc:
-        def run(job_data)
-          Base.execute job_data
+      private
+        def require_job_options_kwarg?
+          @require_job_options_kwarg ||=
+            JobWrapper.method(:enqueue).parameters.any? { |ptype, pname| ptype == :key && pname == :job_options }
+        end
+
+        class JobWrapper < Que::Job # :nodoc:
+          def run(job_data)
+            Base.execute job_data
+          end
         end
-      end
     end
   end
 end