WIP

Author: solnic

sentry-rails/spec/active_job/solid_queue_spec.rb

@@ -5,10 +5,20 @@
 if RAILS_VERSION >= 7.1 && RUBY_VERSION >= "3.1"
   require "solid_queue"
 
-  RSpec.describe "Sentry + ActiveJob on SolidQueue" do
+  RSpec.describe "Sentry + ActiveJob on SolidQueue", type: :job do
     include ActiveSupport::Testing::TimeHelpers
     include_context "active_job backend harness", adapter: :solid_queue
 
+    # Instantiated once. Each SolidQueueAdapter.new registers a
+    # SolidQueue.on_worker_stop callback at class-load time (mutating
+    # global SolidQueue state), so creating a fresh adapter per example
+    # would accumulate callbacks across the run.
+    SOLID_QUEUE_ADAPTER_FOR_TEST = ::ActiveJob::QueueAdapters::SolidQueueAdapter.new
+
+    def queue_adapter_for_test
+      SOLID_QUEUE_ADAPTER_FOR_TEST
+    end
+
     WORKER_SHARD_COUNT = 4
 
     def boot_adapter(_adapter)
@@ -86,9 +96,19 @@ def drain(at: nil)
         name: "spec-#{SecureRandom.hex(4)}"
       )
 
+      # Loop until both ready and scheduled tables are empty so that
+      # retry_on cascades cleanly: a failing perform pushes the job into
+      # SolidQueue::ScheduledExecution (via enqueue_at), which the next
+      # iteration promotes to ReadyExecution and claims for execution.
+      # A single dispatch+claim pass would only observe the first
+      # attempt.
       run = lambda do
-        SolidQueue::ScheduledExecution.dispatch_next_batch(100)
-        SolidQueue::ReadyExecution.claim("*", 100, process.id).each(&:perform)
+        loop do
+          SolidQueue::ScheduledExecution.dispatch_next_batch(100)
+          ready = SolidQueue::ReadyExecution.claim("*", 100, process.id)
+          break if ready.empty? && SolidQueue::ScheduledExecution.none?
+          ready.each(&:perform)
+        end
       end
 
       # Only wrap in travel_to when the caller explicitly asks for a future
@@ -97,6 +117,10 @@ def drain(at: nil)
       at ? travel_to(at, &run) : run.call
     end
 
+    def last_enqueued_payload
+      SolidQueue::Job.order(:id).last&.arguments
+    end
+
     it_behaves_like "a Sentry-instrumented ActiveJob backend"
     it_behaves_like "an ActiveJob backend that supports distributed tracing"
   end