Call previous on_thread_error when silencing exceptions

For unsilenced exceptions, this was calling the
`silent_on_thread_error_for` replacement because it was being assigned
before calling it.

Author: rosa

test/integration/jobs_lifecycle_test.rb

@@ -4,13 +4,14 @@
 
 class JobsLifecycleTest < ActiveSupport::TestCase
   setup do
-    SolidQueue.on_thread_error = silent_on_thread_error_for([ ExpectedTestError, RaisingJob::DefaultError ])
+    @_on_thread_error = SolidQueue.on_thread_error
+    SolidQueue.on_thread_error = silent_on_thread_error_for([ ExpectedTestError, RaisingJob::DefaultError ], @_on_thread_error)
     @worker = SolidQueue::Worker.new(queues: "background", threads: 3)
     @dispatcher = SolidQueue::Dispatcher.new(batch_size: 10, polling_interval: 0.2)
   end
 
   teardown do
-    SolidQueue.on_thread_error = @on_thread_error
+    SolidQueue.on_thread_error = @_on_thread_error
     @worker.stop
     @dispatcher.stop
 

test/test_helper.rb

@@ -31,9 +31,8 @@ class ActiveSupport::TestCase
   include ConfigurationTestHelper, ProcessesTestHelper, JobsTestHelper
 
   setup do
-    # Could be cleaner with one several minitest gems, but didn't want to add new dependency
     @_on_thread_error = SolidQueue.on_thread_error
-    SolidQueue.on_thread_error = silent_on_thread_error_for(ExpectedTestError)
+    SolidQueue.on_thread_error = silent_on_thread_error_for(ExpectedTestError, @_on_thread_error)
   end
 
   teardown do
@@ -84,21 +83,17 @@ def skip_active_record_query_cache(&block)
     # @param [Exception, Array<Exception>] expected an Exception or an array of Exceptions to ignore
     # @yield Executes the provided block with specified exception(s) silenced
     def silence_on_thread_error_for(expected, &block)
-      SolidQueue.with(on_thread_error: silent_on_thread_error_for(expected)) do
+      current_proc = SolidQueue.on_thread_error
+
+      SolidQueue.with(on_thread_error: silent_on_thread_error_for(expected, current_proc)) do
         block.call
       end
     end
 
-    # Does not call on_thread_error for expected exceptions
-    # @param [Exception, Array<Exception>] expected an Exception or an array of Exceptions to ignore
-    def silent_on_thread_error_for(expected)
-      current_proc = SolidQueue.on_thread_error
-
+    def silent_on_thread_error_for(exceptions, on_thread_error)
       ->(exception) do
-        expected_exceptions = Array(expected)
-
-        unless expected_exceptions.any? { exception.instance_of?(_1) }
-          current_proc.call(exception)
+        unless Array(exceptions).any? { |e| exception.instance_of?(e) }
+          on_thread_error.call(exception)
         end
       end
     end