Fix enqueuing recurring task with job outside Solid Queue

Calling `set` on the job class returns a `ConfiguredJob`, and calling
`perform_later` on a `ConfiguredJob` doesn't yield the job to a block
passed as parameter, so we can't check if the enqueuing was successful
or not. To work around this, the only way is to instantiate the job
ourselves with the arguments, then call `enqueue` on that, and rely on
the result, which would be what `job_class.perform_later` would yield
to the block.

Author: rosa

app/models/solid_queue/recurring_task.rb

@@ -55,7 +55,7 @@ def enqueue(at:)
         else
           payload[:other_adapter] = true
 
-          perform_later do |job|
+          perform_later.tap do |job|
             unless job.successfully_enqueued?
               payload[:enqueue_error] = job.enqueue_error&.message
             end
@@ -106,8 +106,10 @@ def enqueue_and_record(run_at:)
         end
       end
 
-      def perform_later(&block)
-        job_class.set(enqueue_options).perform_later(*arguments_with_kwargs, &block)
+      def perform_later
+        job_class.new(*arguments_with_kwargs).tap do |active_job|
+          active_job.enqueue(enqueue_options)
+        end
       end
 
       def arguments_with_kwargs

test/integration/instrumentation_test.rb

@@ -305,12 +305,12 @@ class InstrumentationTest < ActiveSupport::TestCase
 
   test "enqueuing recurring task emits enqueue_recurring_task event" do
     recurring_task = { example_task: { class: "AddToBufferJob", schedule: "every second", args: 42 } }
-    dispatcher = SolidQueue::Dispatcher.new(concurrency_maintenance: false, recurring_tasks: recurring_task)
+    scheduler = SolidQueue::Scheduler.new(recurring_tasks: recurring_task)
 
     events = subscribed("enqueue_recurring_task.solid_queue") do
-      dispatcher.start
+      scheduler.start
       sleep 1.01
-      dispatcher.stop
+      scheduler.stop
     end
 
     assert events.size >= 1
@@ -323,12 +323,12 @@ class InstrumentationTest < ActiveSupport::TestCase
 
   test "skipping a recurring task is reflected in the enqueue_recurring_task event" do
     recurring_task = { example_task: { class: "AddToBufferJob", schedule: "every second", args: 42 } }
-    dispatchers = 2.times.collect { SolidQueue::Dispatcher.new(concurrency_maintenance: false, recurring_tasks: recurring_task) }
+    schedulers = 2.times.collect { SolidQueue::Scheduler.new(recurring_tasks: recurring_task) }
 
     events = subscribed("enqueue_recurring_task.solid_queue") do
-      dispatchers.each(&:start)
+      schedulers.each(&:start)
       sleep 1.01
-      dispatchers.each(&:stop)
+      schedulers.each(&:stop)
     end
 
     assert events.size >= 2
@@ -349,12 +349,12 @@ class InstrumentationTest < ActiveSupport::TestCase
     recurring_task = { example_task: { class: "AddToBufferJob", schedule: "every second", args: 42 } }
     SolidQueue::Job.stubs(:create!).raises(ActiveRecord::Deadlocked)
 
-    dispatcher = SolidQueue::Dispatcher.new(concurrency_maintenance: false, recurring_tasks: recurring_task)
+    scheduler = SolidQueue::Scheduler.new(recurring_tasks: recurring_task)
 
     events = subscribed("enqueue_recurring_task.solid_queue") do
-      dispatcher.start
+      scheduler.start
       sleep(1.01)
-      dispatcher.stop
+      scheduler.stop
     end
 
     assert events.size >= 1
@@ -368,14 +368,15 @@ class InstrumentationTest < ActiveSupport::TestCase
   test "an error enqueuing a recurring task with another adapter is reflected in the enqueue_recurring_task event" do
     AddToBufferJob.queue_adapter = :async
     ActiveJob::QueueAdapters::AsyncAdapter.any_instance.stubs(:enqueue).raises(ActiveJob::EnqueueError.new("All is broken"))
+
     recurring_task = { example_task: { class: "AddToBufferJob", schedule: "every second", args: 42 } }
 
-    dispatcher = SolidQueue::Dispatcher.new(concurrency_maintenance: false, recurring_tasks: recurring_task)
+    scheduler = SolidQueue::Scheduler.new(recurring_tasks: recurring_task)
 
     events = subscribed("enqueue_recurring_task.solid_queue") do
-      dispatcher.start
+      scheduler.start
       sleep(1.01)
-      dispatcher.stop
+      scheduler.stop
     end
 
     assert events.size >= 1