Add PollingAndLoggingTestHelper and refactor tests

Author: faraquet

test/test_helper.rb

@@ -28,7 +28,7 @@ class ExpectedTestError < RuntimeError; end
 
 
 class ActiveSupport::TestCase
-  include ConfigurationTestHelper, ProcessesTestHelper, JobsTestHelper
+  include ConfigurationTestHelper, ProcessesTestHelper, JobsTestHelper, PollingAndLoggingTestHelper
 
   setup do
     @_on_thread_error = SolidQueue.on_thread_error

test/test_helpers/polling_and_logging_test_helper.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module PollingAndLoggingTestHelper
+  private
+
+    def with_polling(silence:)
+      old_silence_polling, SolidQueue.silence_polling = SolidQueue.silence_polling, silence
+      yield
+    ensure
+      SolidQueue.silence_polling = old_silence_polling
+    end
+
+    def with_active_record_logger(logger)
+      old_ar_logger, ActiveRecord::Base.logger = ActiveRecord::Base.logger, logger
+
+      if rails_8_1_or_newer?
+        if logger
+          subscription = ActiveSupport::Notifications.subscribe("sql.active_record") do |*args|
+            payload = args.last
+            sql = payload[:sql]
+            logger.debug(sql) if sql
+          end
+        end
+      end
+
+      yield
+    ensure
+      if rails_8_1_or_newer?
+        if defined?(subscription) && subscription
+          ActiveSupport::Notifications.unsubscribe(subscription)
+        end
+      end
+      ActiveRecord::Base.logger = old_ar_logger
+    end
+
+    def rails_8_1_or_newer?
+      Gem::Version.new(Rails.version) >= Gem::Version.new("8.1.0")
+    end
+end

test/unit/dispatcher_test.rb

@@ -118,19 +118,4 @@ class DispatcherTest < ActiveSupport::TestCase
     dispatcher.start
     wait_while_with_timeout(1.second) { !SolidQueue::ScheduledExecution.exists? }
   end
-
-  private
-    def with_polling(silence:)
-      old_silence_polling, SolidQueue.silence_polling = SolidQueue.silence_polling, silence
-      yield
-    ensure
-      SolidQueue.silence_polling = old_silence_polling
-    end
-
-    def with_active_record_logger(logger)
-      old_logger, ActiveRecord::Base.logger = ActiveRecord::Base.logger, logger
-      yield
-    ensure
-      ActiveRecord::Base.logger = old_logger
-    end
 end

test/unit/worker_test.rb

@@ -192,19 +192,4 @@ class WorkerTest < ActiveSupport::TestCase
     @worker.start
     sleep 1.second
   end
-
-  private
-    def with_polling(silence:)
-      old_silence_polling, SolidQueue.silence_polling = SolidQueue.silence_polling, silence
-      yield
-    ensure
-      SolidQueue.silence_polling = old_silence_polling
-    end
-
-    def with_active_record_logger(logger)
-      old_logger, ActiveRecord::Base.logger = ActiveRecord::Base.logger, logger
-      yield
-    ensure
-      ActiveRecord::Base.logger = old_logger
-    end
 end