callbacks_test.rb in rocketjob-3.5.0

- old
+ new

@@ -21,11 +21,10 @@
         private
 
         def before_perform_method
           call_list << 'before_perform_method'
         end
-
       end
 
       # This job adds each callback as they run into an array
       class AfterPerformJob < RocketJob::Job
         field :call_list, type: Array, default: []
@@ -43,18 +42,17 @@
         private
 
         def after_perform_method
           call_list << 'after_perform_method'
         end
-
       end
 
       # This job adds each callback as they run into an array
       class AroundPerformJob < RocketJob::Job
         field :call_list, type: Array, default: []
 
-        around_perform do |job, block|
+        around_perform do |_job, block|
           call_list << 'around_perform_block_before'
           block.call
           call_list << 'around_perform_block_after'
         end
 
@@ -69,11 +67,10 @@
         def around_perform_method
           call_list << 'around_perform_method_before'
           yield
           call_list << 'around_perform_method_after'
         end
-
       end
 
       # This job adds each callback as they run into an array
       class CombinedPerformJob < RocketJob::Job
         field :call_list, type: Array, default: []
@@ -84,11 +81,11 @@
 
         after_perform do
           call_list << 'after_perform_block'
         end
 
-        around_perform do |job, block|
+        around_perform do |_job, block|
           call_list << 'around_perform_block_before'
           block.call
           call_list << 'around_perform_block_after'
         end
 
@@ -106,20 +103,19 @@
 
         def before_perform_method
           call_list << 'before_perform_method'
         end
 
-        def around_perform_method(&block)
+        def around_perform_method
           call_list << 'around_perform_method_before'
-          block.call
+          yield
           call_list << 'around_perform_method_after'
         end
 
         def after_perform_method
           call_list << 'after_perform_method'
         end
-
       end
 
       describe RocketJob::Plugins::Job::Callbacks do
         after do
           @job.destroy if @job && !@job.new_record?
@@ -128,44 +124,43 @@
         describe '#before_perform' do
           it 'runs blocks and functions' do
             @job = BeforePerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
-            expected = %w(before_perform_block before_perform_method perform)
+            expected = %w[before_perform_block before_perform_method perform]
             assert_equal expected, @job.call_list, 'Sequence of before_perform callbacks is incorrect'
           end
         end
 
         describe '#after_perform' do
           it 'runs blocks and functions' do
             @job = AfterPerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
-            expected = %w(perform after_perform_method after_perform_block)
+            expected = %w[perform after_perform_method after_perform_block]
             assert_equal expected, @job.call_list, 'Sequence of after_perform callbacks is incorrect'
           end
         end
 
         describe '#around_perform' do
           it 'runs blocks and functions' do
             @job = AroundPerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
-            expected = %w(around_perform_block_before around_perform_method_before perform around_perform_method_after around_perform_block_after)
+            expected = %w[around_perform_block_before around_perform_method_before perform around_perform_method_after around_perform_block_after]
             assert_equal expected, @job.call_list, 'Sequence of around_perform callbacks is incorrect'
           end
         end
 
         describe 'all callbacks' do
           it 'runs them in the right order' do
             @job = CombinedPerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
-            expected = %w(before_perform_block around_perform_block_before before_perform_method around_perform_method_before perform after_perform_method around_perform_method_after around_perform_block_after after_perform_block)
+            expected = %w[before_perform_block around_perform_block_before before_perform_method around_perform_method_before perform after_perform_method around_perform_method_after around_perform_block_after after_perform_block]
             assert_equal expected, @job.call_list, 'Sequence of around_perform callbacks is incorrect'
           end
         end
-
       end
     end
   end
 end